[gbrainy: 14/14] Merge branch 'gbrainy_16x'
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy: 14/14] Merge branch 'gbrainy_16x'
- Date: Sat, 25 Sep 2010 16:28:59 +0000 (UTC)
commit 9363b3ba930840dcec6701e99a1adb21cba7a1bf
Merge: 688f688 e355a48
Author: Jordi Mas <jmas softcatala org>
Date: Sat Sep 25 18:29:51 2010 +0200
Merge branch 'gbrainy_16x'
data/Makefile.am | 6 +-
data/game-graphics/bucket.svg | 377 ++++
data/game-graphics/dartboard.svg | 105 +
data/game-graphics/horses_men.svg | 151 ++
data/game-graphics/shop.svg | 2099 ++++++++++++++++++++
data/game-graphics/tv_set.svg | 142 ++
data/games.xml | 85 +-
data/verbal_analogies.xml | 97 +-
po/POTFILES.in | 1 +
src/Clients/Classical/Dialogs/AboutDialog.cs | 15 +-
src/Core/Main/GameSession.cs | 19 +-
.../Main/Verbal/AnalogiesPairOfWordsOptions.cs | 66 +-
src/Core/Main/Xml/GameXml.cs | 23 +-
src/Core/Main/Xml/GameXmlDefinition.cs | 16 +-
src/Core/Main/Xml/GameXmlFactory.cs | 27 +-
src/Games/GameList.cs | 1 +
src/Games/Games.csproj | 1 +
src/Games/Logic/PuzzlePercentage.cs | 8 +-
src/Games/Logic/PuzzleRelatedNumbers.cs | 238 +++
src/Games/Logic/PuzzleSquareDots.cs | 166 ++-
src/Games/Makefile.am | 10 +-
tests/Core/GameXmlFactoryTest.cs | 2 +-
tests/test_games.xml | 2 +-
tools/GameXmlGetString.cs | 8 +
24 files changed, 3561 insertions(+), 104 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]