Merge branch 'master' into gtk
authorArun Persaud <arun@nubati.net>
Fri, 4 Sep 2009 05:50:28 +0000 (22:50 -0700)
committerArun Persaud <arun@nubati.net>
Fri, 4 Sep 2009 05:53:27 +0000 (22:53 -0700)
commit1d0d7f60da48fe87c846c32d09f13da67a636948
treef80052dae077575dc9f69c646484c2b977388c3e
parentb251a5c78eeee842cc0f5984c2b87d832ef7e657
parentb3da85b21462b01c2c0c7f574ac2423703342c55
Merge branch 'master' into gtk

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