new file:   AUTHORS
	new file:   COPYING
	new file:   ChangeLog
	new file:   HACKING
	new file:   INSTALL
	new file:   MAINTAINERS
	new file:   Makefile.am
	new file:   NEWS
	new file:   README
	new file:   THANKS
	new file:   TODO
	new file:   autogen.sh
	new file:   configure.ac
	new file:   doc/Doxfile
	new file:   doc/FmodAudioPlayer.cpp
	new file:   doc/MainPage.h
	new file:   doc/local-of-NASA.png
	new file:   doc/pepe.pach
	new file:   src/portable/AppDelegate.cpp
	new file:   src/portable/AppDelegate.h
	new file:   src/portable/AppMacros.h
	new file:   src/portable/scene/Levels.cpp
	new file:   src/portable/scene/Levels.h
	new file:   src/portable/scene/LoadLevel.cpp
	new file:   src/portable/scene/LoadLevel.h
	new file:   src/portable/scene/MenuLayer.cpp
	new file:   src/portable/scene/MenuLayer.h
	new file:   src/portable/scene/ShaderNode.cpp
o
	new file:   src/portable/scene/ShaderNode.h
	new file:   src/portable/scene/Level1/L1Bunny.cpp
	new file:   src/portable/scene/Level1/L1Bunny.h
	new file:   src/portable/scene/Level1/L1CollisionListener.cpp
	new file:   src/portable/scene/Level1/L1CollisionListener.h
	new file:   src/portable/scene/Level1/L1GameLayer.cpp
	new file:   src/portable/scene/Level1/L1GameLayer.h
	new file:   src/portable/scene/Level1/L1GameOverScene.cpp
	new file:   src/portable/scene/Level1/L1GameOverScene.h
	new file:   src/portable/scene/Level1/L1Menu.cpp
	new file:   src/portable/scene/Level1/L1Menu.h
	new file:   src/portable/scene/Level1/L1Splash.cpp
	new file:   src/portable/scene/Level1/L1Splash.h
	new file:   src/portable/scene/Level1/L1Stone.cpp
	new file:   src/portable/scene/Level1/L1Stone.h
	new file:   src/portable/scene/Level1/L1b2Sprite.cpp
	new file:   src/portable/scene/Level1/L1b2Sprite.h
	new file:   src/portable/scene/Level3/L3GameLayer.cpp
	new file:   src/portable/scene/Level3/L3GameLayer.h
	new file:   src/portable/scene/Level3/L3Menu.cpp
	new file:   src/portable/scene/Level3/L3Menu.h
	new file:   src/plataform/linux/Makefile.am
	new file:   src/plataform/linux/main.cpp
	new file:   Resources/Fonts/MenuLayer/helvetica-32.fnt
	new file:   Resources/Fonts/MenuLayer/helvetica-geneva-32.png
	new file:   Resources/IMG/desktop/MenuLayer/Brick.png
	new file:   Resources/IMG/desktop/MenuLayer/Striper.plist
	new file:   Resources/IMG/desktop/MenuLayer/Striper.png
	new file:   Resources/IMG/desktop/MenuLayer/Sun.png
	new file:   Resources/IMG/desktop/MenuLayer/audio-volume-high.png
	new file:   Resources/IMG/desktop/MenuLayer/audio-volume-low.png
	new file:   Resources/IMG/desktop/MenuLayer/audio-volume-medium.png
	new file:   Resources/IMG/desktop/MenuLayer/audio-volume-muted.png
	new file:   Resources/IMG/desktop/MenuLayer/credits_button.png
	new file:   Resources/IMG/desktop/MenuLayer/credits_button_pressed.png
	new file:   Resources/IMG/desktop/MenuLayer/exit.png
	new file:   Resources/IMG/desktop/MenuLayer/exit_pressed.png
	new file:   Resources/IMG/desktop/MenuLayer/play_button.png
	new file:   Resources/IMG/desktop/MenuLayer/play_button_pressed.png
	new file:   Resources/IMG/desktop/MenuLayer/sliderProgress.png
	new file:   Resources/IMG/desktop/MenuLayer/sliderThumb.png
	new file:   Resources/IMG/desktop/MenuLayer/sliderTrack.png
	new file:   Resources/IMG/desktop/MenuLayer/speaker1.png
	new file:   Resources/IMG/desktop/MenuLayer/speaker3.png
	new file:   Resources/IMG/desktop/MenuLayer/speaker5.png
	new file:   Resources/IMG/desktop/MenuLayer/splash_screen.png
	new file:   Resources/Shaders/MenuLayer/Common.vsh
	new file:   Resources/Shaders/MenuLayer/Sun.fsh
	new file:   Resources/Shaders/MenuLayer/VerticalGREEN.fsh
	new file:   Resources/Sounds/MenuLayer/background.mp3
	new file:   Resources/IMG/desktop/Level1/carmelite_background.jpg
	new file:   Resources/IMG/desktop/Level1/carmelite_background.png
	new file:   Resources/IMG/desktop/Level1/carmelite_brink.png
	new file:   Resources/IMG/desktop/Level1/dona_idle.png
	new file:   Resources/IMG/desktop/Level1/dona_jumping.png
	new file:   Resources/IMG/desktop/Level1/floor.jpg
	new file:   Resources/IMG/desktop/Level1/go-next.png
	new file:   Resources/IMG/desktop/Level1/go-previous.png
	new file:   Resources/IMG/desktop/Level1/how_to_play.png
	new file:   Resources/IMG/desktop/Level1/how_to_play_pressed.png
	new file:   Resources/IMG/desktop/Level1/local-of-NASA.png
	new file:   Resources/IMG/desktop/Level1/new_game.png
	new file:   Resources/IMG/desktop/Level1/new_game_pressed.png
	new file:   Resources/IMG/desktop/Level1/score_panel.png
	new file:   Resources/Sounds/Level1/background.ogg
	new file:   Resources/Sounds/Level1/jump.wav
	new file:   Resources/Sounds/Level1/uh.wav
Merge branch 'linux' into testing
Merge branch 'MenuLayer' into testing
Merge branch 'Level1' into testing
Merge branch 'Level3' into testing
	modified:   README hay que arreglar los html de rst para ver si github los coje
Merge branch 'project-config' into testing
 On branch MenuLayer
 Changes to be committed: refractorization temporality ended
	modified:   src/portable/AppMacros.h
	modified:   src/portable/scene/MenuLayer.cpp
	modified:   src/portable/scene/MenuLayer.h
 On branch MenuLayer
 Changes to be committed:

Changes to be committed: refractorization temporality ended stage 2
	modified:   src/portable/AppDelegate.cpp
	modified:   src/portable/AppDelegate.h
	modified:   src/portable/AppMacros.h
	modified:   src/portable/scene/Levels.cpp
	modified:   src/portable/scene/Levels.h
	modified:   src/portable/scene/LoadLevel.cpp
	modified:   src/portable/scene/LoadLevel.h
	modified:   src/portable/scene/ShaderNode.cpp
	correiged a fatal bug (divede by 0)=nan
	modified:   src/portable/scene/Level1/L1GameLayer.cpp
	modified:   src/portable/scene/Level1/L1GameLayer.h
	modified:   .gitignore
	ignore the build resut of android project
Merge branch 'git-config' into Level1
Ignore the build result of android
Merge branch 'git-config' into Level3
Ignore the build result of android
Merge branch 'git-config' into MenuLayer
Ignore the build result of android