Branch: refs/heads/develop
  Home:   https://github.com/cytoscape/cytoscape-impl
  Commit: 8204a3b839d32cb88f863db6a93e8eb2f094d298
      
https://github.com/cytoscape/cytoscape-impl/commit/8204a3b839d32cb88f863db6a93e8eb2f094d298
  Author: David <[email protected]>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M 
table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java

  Log Message:
  -----------
  fixes #2227 Distinguished between File->Import->Network... and 
File->Import->Ontology and Annotation... so that method that breaks Ontology 
and Annotation is not called.


  Commit: 4abf3e57f4a3f184438f0ef3c99fb55b15e242b3
      
https://github.com/cytoscape/cytoscape-impl/commit/4abf3e57f4a3f184438f0ef3c99fb55b15e242b3
  Author: David <[email protected]>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M 
table-browser-impl/src/main/java/org/cytoscape/browser/internal/AbstractTableBrowser.java
    M 
table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
    M 
table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTableModel.java
    M 
table-browser-impl/src/main/java/org/cytoscape/browser/internal/PopupMenuHelper.java
    M 
table-browser-impl/src/test/java/org/cytoscape/browser/internal/BrowserTableTest.java
    M 
vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/view/legend/DiscreteLegend.java

  Log Message:
  -----------
  Merge branch 'develop' of github.com:cytoscape/cytoscape-impl into develop


Compare: 
https://github.com/cytoscape/cytoscape-impl/compare/21be19b457d6...4abf3e57f4a3

-- 
You received this message because you are subscribed to the Google Groups 
"cytoscape-cvs" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/cytoscape-cvs.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to