Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Archive
gcompris
Commits
3b389bf1
Commit
3b389bf1
authored
Sep 15, 2005
by
Bruno Coudoin
Browse files
removed commit conflict strings
parent
1a4159b1
Changes
1
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
3b389bf1
...
...
@@ -8,11 +8,6 @@
* boards/boardicons/hexagon.png:
* boards/images/scenery5_background.png:
* src/gcompris/help.c: (gcompris_help_start):
2005-09-14 Bruno coudoin <bruno.coudoin@free.fr>
reviewed by: <delete if not using a buddy>
* boards/images/scenery5_background.png:
2005-09-13 Bruno coudoin <bruno.coudoin@free.fr>
...
...
@@ -30,7 +25,6 @@
* src/boards/python/admin/board_list.py:
>>>>>>> 1.638
2005-09-13 Yves Combe,,, <yves@ycombe.net>
new version was not written in the db when reread boards because of version change.
...
...
@@ -217,7 +211,6 @@
* src/boards/reading.c: (reading_next_level),
(reading_destroy_all_items), (get_wordfile):
>>>>>>> 1.630
2005-09-10 Bruno coudoin <bruno.coudoin@free.fr>
Added non functionnal hanoi_real game (the real tower of hanoi).
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment