git://git.nikiroo.be
/
fanfix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2fac024
5788cc5
)
Merge branch 'subtree'
author
Niki Roo
<niki@nikiroo.be>
Sat, 25 Apr 2020 13:12:47 +0000
(15:12 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Sat, 25 Apr 2020 13:12:47 +0000
(15:12 +0200)
1
2
src/be/nikiroo/fanfix/bundles/Config.java
patch
|
diff1
|
diff2
|
blob
|
history
src/be/nikiroo/fanfix/bundles/UiConfig.java
patch
|
diff1
|
diff2
|
blob
|
history
src/be/nikiroo/fanfix/bundles/ui_description.properties
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/be/nikiroo/fanfix/bundles/Config.java
Simple merge
diff --cc
src/be/nikiroo/fanfix/bundles/UiConfig.java
Simple merge
diff --cc
src/be/nikiroo/fanfix/bundles/ui_description.properties
Simple merge
git://git.nikiroo.be / fanfix.git / commitdiff