BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7add687
a5e9f7d
)
merged trunk into branch
author
Alexander Oppermann
<a.oppermann@bgbm.org>
Tue, 9 Dec 2014 16:21:42 +0000
(16:21 +0000)
committer
Alexander Oppermann
<a.oppermann@bgbm.org>
Tue, 9 Dec 2014 16:21:42 +0000
(16:21 +0000)
1
2
.gitattributes
patch
|
diff1
|
diff2
|
blob
|
history
eu.etaxonomy.taxeditor.editor/plugin.xml
patch
|
diff1
|
diff2
|
blob
|
history
eu.etaxonomy.taxeditor.navigation/plugin.xml
patch
|
diff1
|
diff2
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
.gitattributes
Simple merge
diff --cc
eu.etaxonomy.taxeditor.editor/plugin.xml
Simple merge
diff --cc
eu.etaxonomy.taxeditor.navigation/plugin.xml
Simple merge
diff --cc
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
Simple merge