| commit | feec856bc328a4c3f8719eaa9b267eea443f89c5 | |
| author | Paolo Capriotti <p.capriotti@gmail.com> | |
| Fri, 13 Jul 2007 12:19:21 +0000 (13 14:19 +0200) | ||
| committer | Paolo Capriotti <p.capriotti@gmail.com> | |
| Fri, 13 Jul 2007 12:19:21 +0000 (13 14:19 +0200) | ||
| tree | 7a027b56167e4163a1120bdee2e72803e1d66a06 | treesnapshot (tar.gz zip) |
| parent | affad6addcbc4a0f4029a62b64aec2367c62d6a7 | commitdiff |
| parent | aec37d9cf81c4277d65d6102dac391101b7f2e46 | commitdiff |
Merge branch 'master' into pool_rebirth
Conflicts:
src/graphicalapi.h
src/graphicalapi_unwrapped.h
src/graphicalsystem.cpp
src/graphicalsystem.h
src/variants/chess.cpp
Conflicts:
src/graphicalapi.h
src/graphicalapi_unwrapped.h
src/graphicalsystem.cpp
src/graphicalsystem.h
src/variants/chess.cpp