Merge branch 'better-than-par'
authorMiriam Ruiz <miriam@debian.org>
Sun, 30 Nov 2008 18:51:14 +0000 (30 19:51 +0100)
committerMiriam Ruiz <miriam@debian.org>
Sun, 30 Nov 2008 18:51:14 +0000 (30 19:51 +0100)
1  2 
hex_puzzzle.cpp
savestate.h

diff --cc hex_puzzzle.cpp
Simple merge
diff --cc savestate.h
Simple merge