Public Git Hosting - tagua/yd.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 79d1885 ca2c5f8)

commit	2f134b65231e21ec24f8a0bd4a0b2094ed87287f
author	Paolo Capriotti <p.capriotti@gmail.com>
	Wed, 11 Jul 2007 00:50:08 +0000 (11 02:50 +0200)
committer	Paolo Capriotti <p.capriotti@gmail.com>
	Wed, 11 Jul 2007 00:52:46 +0000 (11 02:52 +0200)
tree	c14a37e6b3b19e1f8ecab3fe1a0696ab43851f4c	tree \| snapshot (tar.gz zip)
parent	79d1885577b7c8ebaaf8dfa6beb5949b37ee447f	commit \| diff
parent	ca2c5f8ca7029e590069655b3ade6ad73a1ee025	commit \| diff

Merge branch 'master' into pool_rebirth

Conflicts:

src/graphicalapi.h
src/graphicalsystem.cpp
src/graphicalsystem.h
src/variants/chess.cpp

src/graphicalapi.h	diff1 \|	diff2 \|	blob \| history
src/graphicalapi_unwrapped.h	diff1 \|	diff2 \|	blob \| history
src/graphicalsystem.cpp	diff1 \|	diff2 \|	blob \| history
src/graphicalsystem.h	diff1 \|	diff2 \|	blob \| history
src/variants/chess.cpp	diff1 \|	diff2 \|	blob \| history

Yann's patches for tagua