| commit | 5abeb112d968d75b9bf313ede6cfd309f09948e4 | |
| author | Yann Dirson <ydirson@altern.org> | |
| Fri, 4 Apr 2008 09:49:08 +0000 (4 11:49 +0200) | ||
| committer | Yann Dirson <ydirson@altern.org> | |
| Fri, 4 Apr 2008 10:20:07 +0000 (4 12:20 +0200) | ||
| tree | 323131921a0e3aaf6b420849af09758bf082ec98 | treesnapshot (tar.gz zip) |
| parent | 1845a91c0576df801d30b6658e2105819518c460 | commitdiff |
| parent | 0a477aaea125aa1ce0c57a65c6d0817e1dd7c5ff | commitdiff |
Merge commit 'v1.0-alpha2' into component-api
Conflicts:
debian/changelog
debian/rules
src/chesstable.h
src/hlvariant/shogi/legalitycheck.h
src/hlvariant/tori-shogi/legalitycheck.h
src/mainwindow.cpp
src/ui.h
Conflicts:
debian/changelog
debian/rules
src/chesstable.h
src/hlvariant/shogi/legalitycheck.h
src/hlvariant/tori-shogi/legalitycheck.h
src/mainwindow.cpp
src/ui.h