Merge branch 'master' into genomics
Conflicts: web/src/main/webapp/resources/js/AliasInfoWindow.js
Showing
- .classpath 23 additions, 23 deletions.classpath
- .project 35 additions, 35 deletions.project
- .settings/org.eclipse.core.resources.prefs 4 additions, 4 deletions.settings/org.eclipse.core.resources.prefs
- .settings/org.eclipse.jdt.core.prefs 2 additions, 2 deletions.settings/org.eclipse.jdt.core.prefs
- .settings/org.eclipse.m2e.core.prefs 4 additions, 4 deletions.settings/org.eclipse.m2e.core.prefs
- .settings/org.eclipse.wst.validation.prefs 18 additions, 18 deletions.settings/org.eclipse.wst.validation.prefs
- CellDesigner-plugin/.classpath 36 additions, 36 deletionsCellDesigner-plugin/.classpath
- CellDesigner-plugin/.project 29 additions, 29 deletionsCellDesigner-plugin/.project
- CellDesigner-plugin/.settings/org.eclipse.core.resources.prefs 6 additions, 6 deletions...esigner-plugin/.settings/org.eclipse.core.resources.prefs
- CellDesigner-plugin/.settings/org.eclipse.jdt.core.prefs 5 additions, 5 deletionsCellDesigner-plugin/.settings/org.eclipse.jdt.core.prefs
- CellDesigner-plugin/.settings/org.eclipse.m2e.core.prefs 4 additions, 4 deletionsCellDesigner-plugin/.settings/org.eclipse.m2e.core.prefs
- CellDesigner-plugin/build.xml 34 additions, 34 deletionsCellDesigner-plugin/build.xml
- CellDesigner-plugin/install.xml 21 additions, 21 deletionsCellDesigner-plugin/install.xml
- CellDesigner-plugin/pom.xml 84 additions, 84 deletionsCellDesigner-plugin/pom.xml
- CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyAction.java 90 additions, 90 deletions...in/java/lcsb/mapviewer/cdplugin/copypaste/CopyAction.java
- CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyPastePlugin.java 130 additions, 130 deletions...va/lcsb/mapviewer/cdplugin/copypaste/CopyPastePlugin.java
- CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyPluginAction.java 61 additions, 61 deletions...a/lcsb/mapviewer/cdplugin/copypaste/CopyPluginAction.java
- CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/PasteAction.java 82 additions, 82 deletions...n/java/lcsb/mapviewer/cdplugin/copypaste/PasteAction.java
- CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/PastePluginAction.java 60 additions, 60 deletions.../lcsb/mapviewer/cdplugin/copypaste/PastePluginAction.java
- CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/package-info.java 9 additions, 9 deletions.../java/lcsb/mapviewer/cdplugin/copypaste/package-info.java
Loading
Please register or sign in to comment