[gnome-sudoku: 68/68] Merge branch 'vala-port'
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sudoku: 68/68] Merge branch 'vala-port'
- Date: Sat, 31 May 2014 15:02:03 +0000 (UTC)
commit 84c62cd43fb59b267afb27822c0e422ddd5fb77f
Merge: 162ad9f 4baa057
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sat May 31 10:00:28 2014 -0500
Merge branch 'vala-port'
Conflicts:
src/lib/number_box.py
Makefile.am | 3 +-
ROADMAP | 126 ++++
TODO | 54 ++
configure.ac | 24 +-
data/Makefile.am | 7 +-
data/gnome-sudoku-menu.ui | 50 ++
data/gnome-sudoku.desktop.in | 2 +-
data/gnome-sudoku.ui | 102 ++++
data/{print_games.ui => print-games.ui} | 141 +++--
data/select_game.ui | 135 -----
data/tracker.ui | 104 ----
po/lt.po | 1 -
src/Makefile.am | 48 ++-
src/config.vapi | 4 +
src/gnome-sudoku | 23 -
src/gnome-sudoku.gresource.xml.in | 14 +
src/gnome-sudoku.vala | 283 +++++++++
src/lib/Makefile.am | 33 -
src/lib/__init__.py | 1 -
src/lib/colors.py | 85 ---
src/lib/dancer.py | 137 -----
src/lib/defaults.py | 58 --
src/lib/defs.py.in | 2 -
src/lib/dialog_swallower.py | 77 ---
src/lib/game_selector.py | 282 ---------
src/lib/gnome_sudoku.py | 25 -
src/lib/gsudoku.py | 817 -------------------------
src/lib/gtk_goodies/Makefile.am | 9 -
src/lib/gtk_goodies/Undo.py | 474 ---------------
src/lib/gtk_goodies/__init__.py | 1 -
src/lib/gtk_goodies/dialog_extras.py | 236 --------
src/lib/main.py | 994 -------------------------------
src/lib/number_box.py | 815 -------------------------
src/lib/pausable.py | 66 --
src/lib/printing.py | 216 -------
src/lib/saver.py | 281 ---------
src/lib/simple_debug.py | 45 --
src/lib/sudoku.py | 914 ----------------------------
src/lib/sudoku_maker.py | 608 -------------------
src/lib/sudoku_thumber.py | 161 -----
src/lib/timer.py | 87 ---
src/lib/tracker_info.py | 208 -------
src/logical-sudoku-solver.vala | 277 +++++++++
src/main.vala | 91 +++
src/number-picker.vala | 87 +++
src/sudoku-board.vala | 574 ++++++++++++++++++
src/sudoku-game.vala | 131 ++++
src/sudoku-generator.vala | 415 +++++++++++++
src/sudoku-printer.vala | 368 ++++++++++++
src/sudoku-saver.vala | 203 +++++++
src/sudoku-solver.vala | 892 +++++++++++++++++++++++++++
src/sudoku-store.vala | 140 +++++
src/sudoku-view.vala | 716 ++++++++++++++++++++++
53 files changed, 4680 insertions(+), 6967 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]