projects
/
pub
/
Android
/
ownCloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bf21e3f
1809997
)
Merge branch 'setup_colors' into setup_app_name
author
masensio
<masensio@solidgear.es>
Fri, 18 Oct 2013 10:24:29 +0000
(12:24 +0200)
committer
masensio
<masensio@solidgear.es>
Fri, 18 Oct 2013 10:24:29 +0000
(12:24 +0200)
1
2
res/values/setup.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/setup.xml
Simple merge