Project

General

Profile

« Previous | Next » 

Revision 12cf452e

Added by Patrick Plitzner about 6 years ago

Merge branch 'develop' into e4

Conflicts:

eu.etaxonomy.taxeditor.cdmlib/.classpath

eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF

eu.etaxonomy.taxeditor.cdmlib/build.properties

eu.etaxonomy.taxeditor.editor/fragment.e4xmi

  • added
  • modified
  • copied
  • renamed
  • deleted