BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c370688 1568c43)
merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 1 Jul 2014 13:15:58 +0000 (13:15 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 1 Jul 2014 13:15:58 +0000 (13:15 +0000)
1  2 
.gitattributes patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.cdmlib/.classpath patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar patch | diff1 | diff2 | blob | history

diff --cc .gitattributes
Simple merge
diff --cc eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar
index 9fb167cc8644ced846238dee40784f7341832719,9fb167cc8644ced846238dee40784f7341832719..4cf488ee33f1a17bac6e7badc2adfac6cf54f75d
Binary files differ
diff --cc eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
index 25f118068392d39fda76feea6c855dfb3633db17,25f118068392d39fda76feea6c855dfb3633db17..f131a431cbf20a8f2194c84912950bd3e0a6485b
Binary files differ