projects
/
xboard.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e677df0
d6ad098
)
Merge branch 'v4.7.x' into master
author
Arun Persaud
<arun@nubati.net>
Wed, 10 Sep 2014 03:15:45 +0000 (20:15 -0700)
committer
Arun Persaud
<arun@nubati.net>
Wed, 10 Sep 2014 03:18:18 +0000 (20:18 -0700)
Conflicts:
configure.ac
po/da.po
po/de.po
po/es.po
po/it.po
po/ru.po
po/tr.po
po/uk.po
po/vi.po
po/xboard.pot
po/zh_CN.po
po/zh_HK.po
po/zh_TW.po
winboard/config.h
1
2
xaw/xboard.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
xaw/xboard.c
Simple merge