OSDN Git Service
(root)
/
android-x86
/
packages-apps-ConnectBot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d7f9f30
546d9cd
)
merge from donut-x86
eclair-x86
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Fri, 5 Mar 2010 13:05:55 +0000
(21:05 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Fri, 5 Mar 2010 13:05:55 +0000
(21:05 +0800)
Conflicts:
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-fr/strings.xml
res/values-pt/strings.xml
Trivial merge