merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 17 Jun 2015 13:52:06 +0000 (13:52 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 17 Jun 2015 13:52:06 +0000 (13:52 +0000)
1  2 
.gitignore

diff --cc .gitignore
@@@ -66,6 -37,6 +66,7 @@@ eu.etaxonomy.taxeditor.store/targe
  eu.etaxonomy.taxeditor.test/screenshots/*.jpeg
  eu.etaxonomy.taxeditor.test/target
  eu.etaxonomy.taxeditor/.settings
++eu.etaxonomy.taxeditor/rcp.target
  eu.etaxonomy.taxeditor/target
  /runtime-taxeditor.product
  /target