projects
/
xboard.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f5a68b1
4418fd0
)
Merge branch 'master' into v4.6.x
author
Arun Persaud
<arun@nubati.net>
Sun, 18 Dec 2011 18:58:49 +0000 (10:58 -0800)
committer
Arun Persaud
<arun@nubati.net>
Sun, 18 Dec 2011 18:58:49 +0000 (10:58 -0800)
Conflicts:
po/uk.po -- used latest version to resolve merge conflict
Trivial merge
projects / xboard.git / commitdiff