Merge branch 'master' into gtk
authorArun Persaud <arun@nubati.net>
Sat, 3 Oct 2009 17:48:41 +0000 (10:48 -0700)
committerArun Persaud <arun@nubati.net>
Sat, 3 Oct 2009 17:55:50 +0000 (10:55 -0700)
commit5120d477cacfa58108ad93a414af083f1fb58c5a
tree05a2dda58c767cc907ccb1c4f7af9bf83b03d953
parent56836aae09c32b4300cc79f8231a76e99d90fc02
parent2363bb5476772d84a81dce759ad95b375bd7bfe7
Merge branch 'master' into gtk

Conflicts:
Makefile.am
backend.c
configure.ac
xboard.c
Makefile.am
backend.c
xboard.c
xengineoutput.c