diff options
| author | totycro <totycro@unknown-horizons.org> | 2011-04-09 15:11:35 +0200 |
|---|---|---|
| committer | totycro <totycro@unknown-horizons.org> | 2011-04-09 15:11:35 +0200 |
| commit | 13199a5212e210206b8d6b938f7c1683760cf226 (patch) | |
| tree | cba982d54d62081589d31f188796b65fc51b703d /pacman-c++/sceneholder.h | |
| parent | 979c3b4528da1608404d6e163211280fee5da9c5 (diff) | |
| parent | 827a9b10539af4a8c4cff70fa345254668d294c7 (diff) | |
| download | foop-13199a5212e210206b8d6b938f7c1683760cf226.tar.gz foop-13199a5212e210206b8d6b938f7c1683760cf226.tar.bz2 foop-13199a5212e210206b8d6b938f7c1683760cf226.zip | |
Merge branch 'master' of git.manuel.mausz.at:/foop
Conflicts:
pacman-c++/sceneholder.cpp
pacman-c++/util.h
Diffstat (limited to 'pacman-c++/sceneholder.h')
| -rw-r--r-- | pacman-c++/sceneholder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pacman-c++/sceneholder.h b/pacman-c++/sceneholder.h index cf6941a..f188956 100644 --- a/pacman-c++/sceneholder.h +++ b/pacman-c++/sceneholder.h | |||
| @@ -35,4 +35,4 @@ protected: | |||
| 35 | 35 | ||
| 36 | }; | 36 | }; |
| 37 | 37 | ||
| 38 | #endif // SCENEHOLDER_H \ No newline at end of file | 38 | #endif // SCENEHOLDER_H |