Project

General

Profile

« Previous | Next » 

Revision 999d37c4

ID999d37c42eeb8050f0269503cfa2aee48cda3d01
Parent a63b22b4, 64a4022f
Child a52450e2

Added by Cherian Mathew about 5 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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

Add picture from clipboard (Maximum size: 40 MB)