projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved over some changes from cvs
[supertux.git]
/
src
/
resources.cpp
diff --git
a/src/resources.cpp
b/src/resources.cpp
index
3cacede
..
f2c3c0a
100644
(file)
--- a/
src/resources.cpp
+++ b/
src/resources.cpp
@@
-24,7
+24,6
@@
#include "app/setup.h"
#include "gui/menu.h"
#include "gui/button.h"
#include "app/setup.h"
#include "gui/menu.h"
#include "gui/button.h"
-#include "scene.h"
#include "resources.h"
#include "tile_manager.h"
#include "object/gameobjs.h"
#include "resources.h"
#include "tile_manager.h"
#include "object/gameobjs.h"
@@
-43,6
+42,7
@@
Menu* contrib_subset_menu = 0;
MusicRef herring_song;
MusicRef level_end_song;
MusicRef herring_song;
MusicRef level_end_song;
+MusicRef credits_song;
SpriteManager* sprite_manager = 0;
TileManager* tile_manager = 0;
SpriteManager* sprite_manager = 0;
TileManager* tile_manager = 0;