Project

General

Profile

« Previous | Next » 

Revision 10a7412e

ID10a7412ebac5fa9ec2e930c123f25ea3b999fb6c
Parent 92ac65d5, 914fc520
Child 0b04e295

Added by Patrick Plitzner over 1 year ago

Merge branch 'develop' into e4

Conflicts:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java

eu.etaxonomy.taxeditor.store/fragment.e4xmi

eu.etaxonomy.taxeditor.workbench/fragment.e4xmi

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

Add picture from clipboard (Maximum size: 40 MB)