« Previous | Next »

Revision 12cf452e

Added by Patrick Plitzner over 5 years ago

ID 12cf452e53ba08d404a34e7937236a7e81b362b2
Parent 2f17d56c, 38a5ce3e
Child 61fadfde

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¶

Changes

added
modified
copied
renamed
deleted