Merge branch 'master' into gtk
authorArun Persaud <arun@nubati.net>
Wed, 14 Oct 2009 04:17:33 +0000 (21:17 -0700)
committerArun Persaud <arun@nubati.net>
Wed, 14 Oct 2009 04:17:33 +0000 (21:17 -0700)
commit31fcc3f34eacc04811cbfc3165a5e839aa81f015
tree721220785e347fe0e303b69f2a3f80b847f2bc37
parentfc82040aea466a4b122305b8c74d8122f4ba035a
parent532a8a1561833a5ba0d571025c8c30c40502a976
Merge branch 'master' into gtk

Conflicts:
backend.c
xboard.c
backend.c
callback.c
frontend.h
xboard.c