Merge branch 'master' into gtk
authorArun Persaud <arun@nubati.net>
Wed, 13 Jan 2010 04:11:06 +0000 (20:11 -0800)
committerArun Persaud <arun@nubati.net>
Wed, 13 Jan 2010 04:11:06 +0000 (20:11 -0800)
commit344885687fdf87558b7932280545f5f4ea78771c
tree2c5a66154e82318b9749e7f5cfe8bededad0a18c
parentfe5ba22edf2cb7c260ecf17c7f095f0bc3e1b0a3
parent4c2a4a8be3521597c9b19749cfdc998108824f9e
Merge branch 'master' into gtk

Conflicts:
backend.c
xboard.c
Makefile.am
backend.c
frontend.h
xboard.c