projects / chessclock / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b4cccbf 37fa983)
Merge branch 'settings' into harmattan
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Thu, 6 Oct 2011 16:36:54 +0000 (19:36 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Thu, 6 Oct 2011 16:44:38 +0000 (19:44 +0300)
commitd56efbcce9e0683e2e6027bf8af521eb1c5ca4a0
tree7beb6ca922bf1014ce7b05ead7b5fab600093596tree | snapshot
parentb4cccbf12c8b0537f19f6b8d4987f7275cf15389commit | diff
parent37fa983b00a81e925209323eb1edc2adac9b8962commit | diff
Merge branch 'settings' into harmattan

The game settings chosen in the new game dialog are saved (separately
for each time control).

Conflicts:
chessclock.pro
main.cpp
qml/NewGameDialogPage.qml
chessclock.pro diff1 | diff2 | blob | history
main.cpp diff1 | diff2 | blob | history
qml/NewGameDialogPage.qml diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.