winboard.nl Git - xboard.git/commit

projects / xboard.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 42e082f 0f1e3ac)

author	Arun Persaud <arun@nubati.net>
	Thu, 29 Aug 2013 05:04:01 +0000 (22:04 -0700)
committer	Arun Persaud <arun@nubati.net>
	Thu, 29 Aug 2013 05:04:01 +0000 (22:04 -0700)
commit	8cefe2a816d82b1afa5e90fde51e3edfaf645f64
tree	c92b296d93e4cff0417e27adcb70f048f201721b	tree \| snapshot
parent	42e082f4052f89c0dc29c9f04054bee3b31588fe	commit \| diff
parent	0f1e3acd9ec3e283afe4bc1bf31f3fb8782611d3	commit \| diff

Merge branch 'v4.7.x'

Conflicts:
winboard/winboard.c

also fixed version number and po files after merge with v4.7.x branch

14 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
po/da.po	diff1 \|	diff2 \|	blob \| history
po/de.po	diff1 \|	diff2 \|	blob \| history
po/es.po	diff1 \|	diff2 \|	blob \| history
po/it.po	diff1 \|	diff2 \|	blob \| history
po/ru.po	diff1 \|	diff2 \|	blob \| history
po/tr.po	diff1 \|	diff2 \|	blob \| history
po/uk.po	diff1 \|	diff2 \|	blob \| history
po/vi.po	diff1 \|	diff2 \|	blob \| history
po/xboard.pot	diff1 \|	diff2 \|	blob \| history
po/zh_CN.po	diff1 \|	diff2 \|	blob \| history
po/zh_HK.po	diff1 \|	diff2 \|	blob \| history
po/zh_TW.po	diff1 \|	diff2 \|	blob \| history
winboard/config.h	diff1 \|	diff2 \|	blob \| history

Graphical Chess board