winboard.nl Git - xboard.git/commit

projects / xboard.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5514b4a 891e6ae)

author	Arun Persaud <arun@nubati.net>
	Sat, 9 Jan 2010 23:44:04 +0000 (15:44 -0800)
committer	Arun Persaud <arun@nubati.net>
	Sat, 9 Jan 2010 23:57:58 +0000 (15:57 -0800)
commit	fe5ba22edf2cb7c260ecf17c7f095f0bc3e1b0a3
tree	5235b4b22580b3848642bba4175d5474762d5dc9	tree \| snapshot
parent	5514b4ae4147a322cb8c818e8bf25a785f881cc9	commit \| diff
parent	891e6ae6b61cb387401b79ad75ae5b2c1d58da5e	commit \| diff

Merge branch 'master-20091209' into gtk

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

compiles, but there command line arguments are not recognized anymore. will fix this later.

Makefile.am	diff1 \|	diff2 \|	blob \| history
backend.c	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
frontend.h	diff1 \|	diff2 \|	blob \| history
gtk-interface.xml	diff1 \|	\|	blob \| history
xboard.c	diff1 \|	diff2 \|	blob \| history
xedittags.c	diff1 \|	diff2 \|	blob \| history
xedittags.h	diff1 \|	diff2 \|	blob \| history
xhistory.c	diff1 \|	diff2 \|	blob \| history
xhistory.h	diff1 \|	diff2 \|	blob \| history

Graphical Chess board