CVSROOT:        /cvs/gnome
Module name:    gcompris
Changes by:     ycombe  06/12/12 19:19:06

Modified files:
        .              : Tag: EXPERIMENTAL ChangeLog INSTALL 
                         Makefile.mingw.in README.mingw configure.in 
        boards         : Tag: EXPERIMENTAL Makefile.am clickgame.xml.in 
                         scalesboard.xml.in 
        boards/babyshapes: Tag: EXPERIMENTAL board1_0.xml.in 
                           board2_0.xml.in board3_0.xml.in 
                           board4_0.xml.in board5_0.xml.in 
                           board6_0.xml.in board7_0.xml.in 
        boards/scales  : Tag: EXPERIMENTAL tabepice.jpg 
        boards/sounds  : Tag: EXPERIMENTAL README 
        boards/sounds/fr/geography: Tag: EXPERIMENTAL africa.ogg 
                                    america.ogg oceania.ogg 
        boards/sounds/melody/guitar: Tag: EXPERIMENTAL son1.ogg son2.ogg 
                                     son3.ogg son4.ogg 
        boards/sounds/melody/xylofon: Tag: EXPERIMENTAL son1.ogg 
                                      son2.ogg son3.ogg son4.ogg 
        docs           : Tag: EXPERIMENTAL gcompris2spip.pl 
        docs/C         : Tag: EXPERIMENTAL python.html python.xml 
        po             : Tag: EXPERIMENTAL ChangeLog POTFILES.in ar.po 
                         es.po it.po pt_BR.po 
        po             : Tag: EXPERIMENTAL ChangeLog POTFILES.in ar.po 
                         es.po it.po pt_BR.po 
        src/boards     : Tag: EXPERIMENTAL Makefile.am advanced_colors.c 
                         algebra_guesscount.c canal_lock.c clickgame.c 
                         clockgame.c colors.c enumerate.c erase.c 
                         gletters.c hanoi.c leftright.c machpuzzle.c 
                         maze.c memory.c menu2.c paratrooper.c 
                         py-mod-gcompris.c py-mod-sound.c railroad.c 
                         read_colors.c shapegame.c smallnumbers.c 
                         submarine.c target.c wordprocessor.c 
                         wordsgame.c 
        src/boards/python: Tag: EXPERIMENTAL Makefile.am algorithm.py 
                           anim.py ballcatch.py electric.py 
                           followline.py gnumch.py hexagon.py melody.py 
                           mosaic.py tuxpaint.py watercycle.py 
        src/gc_sound/python: Tag: EXPERIMENTAL Makefile.am 
        src/gc_sound/src: Tag: EXPERIMENTAL Makefile.am 
                          gc-sound-channel.c gc-sound-item.c 
                          gc-sound-item.h gc-sound-mixer-SDL.c 
        src/gcompris   : Tag: EXPERIMENTAL Makefile.am Makefile.mingw 
                         about.c bar.c board_config.c board_config.h 
                         config.c dialog.c gameutil.c gcompris.c 
                         gcompris.h help.c pixbuf_util.c pixbuf_util.h 
                         properties.c properties.h sdlplayer.c 
                         soundutil.c 
Added files:
        boards         : Tag: EXPERIMENTAL chat.xml.in 
        boards/boardicons: Tag: EXPERIMENTAL chat.png 
        boards/clickgame: Tag: EXPERIMENTAL README sea1.jpg sea2.jpg 
                          sea3.jpg sea4.jpg sea5.jpg sea6.jpg 
        boards/flags   : Tag: EXPERIMENTAL ko.png 
        boards/images  : Tag: EXPERIMENTAL transparent_square_green.png 
                         transparent_square_yellow.png 
        boards/scales  : Tag: EXPERIMENTAL balance.png bras.png 
                         plateau.png 
        boards/skins/gartoon: Tag: EXPERIMENTAL cursor_circle.png 
                              cursor_default.png cursor_del.png 
                              cursor_fill.png cursor_fillcircle.png 
                              cursor_fillrect.png cursor_line.png 
                              cursor_rect.png cursor_select.png 
        boards/sounds  : Tag: EXPERIMENTAL Harbor1.wav Harbor3.wav 
                         Water5.wav apert2.wav bleep.wav brick.wav 
                         bubble.wav darken.wav drip.wav eat.wav 
                         eraser1.wav eraser2.wav flip.wav grow.wav 
                         line_end.wav paint1.wav prompt.wav receive.wav 
                         smudge.wav tuxok.wav youcannot.wav 
        boards/sounds/fr/geography: Tag: EXPERIMENTAL 
                                    basse-normandie.ogg 
                                    champagne-ardenne.ogg 
                                    franche-conte.ogg 
                                    poitou-charentes.ogg slovania.ogg 
        boards/sounds/so/alphabet: Tag: EXPERIMENTAL README 
        boards/sounds/so/colors: Tag: EXPERIMENTAL README 
        boards/sounds/so/geography: Tag: EXPERIMENTAL README 
        boards/sounds/so/misc: Tag: EXPERIMENTAL README 
        po             : Tag: EXPERIMENTAL ko.po 
        po             : Tag: EXPERIMENTAL ko.po 
        src/boards     : Tag: EXPERIMENTAL scale.c 
        src/boards/python: Tag: EXPERIMENTAL chat.py 
        src/gc_sound   : Tag: EXPERIMENTAL configure.in_ALONE 
        src/gcompris   : Tag: EXPERIMENTAL drag.c drag.h 
Removed files:
        boards/scales  : Tag: EXPERIMENTAL Makefile.am board1_0.xml.in 
                         board1_1.xml.in board1_2.xml.in board1_3.xml.in 
                         board1_4.xml.in board1_5.xml.in board2_0.xml.in 
                         board2_1.xml.in board2_2.xml.in board2_3.xml.in 
                         board2_4.xml.in board2_5.xml.in board3_0.xml.in 
                         board3_1.xml.in board3_2.xml.in board3_3.xml.in 
                         board3_4.xml.in board3_5.xml.in scales.png 
        src/gc_sound   : Tag: EXPERIMENTAL configure.in 
        src/gcompris   : Tag: EXPERIMENTAL cursor.c cursor.h 

Log message:
Merge code with HEAD before integrating gc_sound in gcompris.

URL : 
http://cvs.gnome.org/bonsai/cvsquery.cgi?branch=&dir=gcompris&who=ycombe&date=explicit&mindate=2006-12-12%2019:18&maxdate=2006-12-12%2019:20

_______________________________________________
cvs-commits-list mailing list
cvs-commits-list@gnome.org
http://mail.gnome.org/mailman/listinfo/cvs-commits-list

Reply via email to