OSDN Git Service
(root)
/
lamexp
/
LameXP.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
38b2cc1
182ef86
)
Merge branch 'master' of github.com:lordmulder/LameXP
author
lordmulder
<mulder2@gmx.de>
Thu, 15 Nov 2012 17:13:03 +0000
(18:13 +0100)
committer
lordmulder
<mulder2@gmx.de>
Thu, 15 Nov 2012 17:13:03 +0000
(18:13 +0100)
Conflicts:
etc/Translation/Blank.ts
etc/Translation/LameXP_PL.ts
etc/Translation/LameXP_SV.ts
src/Config.h
Trivial merge