BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c71d712 5da1d38)
merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 8 Sep 2014 14:00:23 +0000 (14:00 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 8 Sep 2014 14:00:23 +0000 (14:00 +0000)
1  2 
.gitattributes patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.editor/plugin.xml patch | diff1 | diff2 | blob | history

diff --cc .gitattributes
Simple merge