From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Wed, 17 Jun 2015 13:52:06 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.8.0^2~59^2~56
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/61ec9fa71937f1b68fc589636c4f63bf6711f938

merge-update from trunk
---

61ec9fa71937f1b68fc589636c4f63bf6711f938
diff --cc .gitignore
index 074683469,5c8b928b8..87dc88128
--- a/.gitignore
+++ b/.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