projects
/
xboard.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9fef7e1
5e903d5
)
Merge branch 'master' into v4.6.x
author
Arun Persaud
<arun@nubati.net>
Thu, 23 Feb 2012 07:19:04 +0000 (23:19 -0800)
committer
Arun Persaud
<arun@nubati.net>
Thu, 23 Feb 2012 07:19:04 +0000 (23:19 -0800)
Conflicts:
po/da.po
po/uk.po
used version from master
1
2
configure.ac
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
configure.ac
Simple merge