Merge branch 'master' into gtk
authorArun Persaud <arun@nubati.net>
Sat, 10 Oct 2009 17:01:37 +0000 (10:01 -0700)
committerArun Persaud <arun@nubati.net>
Sat, 10 Oct 2009 17:01:37 +0000 (10:01 -0700)
commitec5fc8ae606b82e39fe06049c09228af50a991e7
tree0b2f08d9ecd9d4e61751de032d7b016ed4facd71
parent043c26f8f082cf74d7d18152775658ff6f611acc
parenta5acdedf686f954492492595b327089f15de76a0
Merge branch 'master' into gtk

Conflicts:
backend.c
xboard.c
xhistory.c
backend.c
xboard.c
xengineoutput.c