added merge-info to sub folder my merging with sub folder from trunk
[taxeditor.git] / eu.etaxonomy.taxeditor.application /
drwxr-xr-x   ..
-rw-r--r-- 542 .classpath
-rw-r--r-- 820 .project
drwxr-xr-x - META-INF
-rw-r--r-- 312 build.properties
drwxr-xr-x - icons
-rw-r--r-- 185 p2.inf
-rw-r--r-- 186 plugin.properties
-rw-r--r-- 14958 plugin.xml
-rw-r--r-- 190 plugin_customization.ini
-rw-r--r-- 655 pom.xml
-rw-r--r-- 702424 splash.bmp
drwxr-xr-x - src