cdmlibcdm-dataportalcdm-servercdm-vaadincdm-webappcdmlib-appsserver-scriptstaxeditortaxongraph-viewutis-clientutis-coreutis-webapp
merge branch to trunk
restoring ModifierEditorInput.java
reintegrating /branches/taxeditor/Kew_Palm_Use_Extension
Merging r14494 through r15285 into /home/andreas/workspaces/_svn-trunk/taxeditor-branches/Kew_Palm_Use_Extension
adding svn ignores
AT: With the conflicts some of the copyrights had reverted to 2007, changed back to 2011
AT: committing changes to the TaxEditor Post merge and tree conflicts
AT:Resolving conflicts
AT:Committing changes post merge
reintegrating branch branches/taxeditor/3.0.11-SNAPSHOT
View all revisions | View revisions
Also available in: Atom