Project

General

Profile

« Previous | Next » 

Revision 999d37c4

Added by Cherian Mathew over 6 years ago

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml

  • added
  • modified
  • copied
  • renamed
  • deleted