Merge branch 'master' into gtk
authorArun Persaud <arun@nubati.net>
Sun, 7 Feb 2010 00:15:15 +0000 (16:15 -0800)
committerArun Persaud <arun@nubati.net>
Sun, 7 Feb 2010 00:15:15 +0000 (16:15 -0800)
commit4042b38821940cd48e9f3d10b5208da7b6288dfd
tree7a6d90b11018acdbbc0c564c798ccc0dfa07e868
parent4626ea070c35a9c59ae231280f96e215dfc9205f
parent32bbe66c5718d2187e62550c058ffd1632b2f3e6
Merge branch 'master' into gtk

Conflicts:
Makefile.am
backend.c
configure.ac
xboard.c
xgamelist.c
Makefile.am
backend.c
configure.ac
frontend.h
xboard.c
xgamelist.c
xoptions.c