summaryrefslogtreecommitdiff
path: root/mana.files
diff options
context:
space:
mode:
authorPrzemysław Grzywacz <nexather@gmail.com>2013-05-24 18:55:53 +0200
committerPrzemysław Grzywacz <nexather@gmail.com>2013-05-24 18:55:53 +0200
commit05dc1666dc794ed6aa7f6568b768c652f8922c4e (patch)
treeaf83e22418e912e8eb8b2bc6b9595da344f461c1 /mana.files
parent703cd73c0baa82d5f8ae3a1b390401f17de32f7a (diff)
parentf9cd8a5d6b4460ffcb945979d1e8cd8ebadc9b8d (diff)
downloadmana-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.gz
mana-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.bz2
mana-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.xz
mana-05dc1666dc794ed6aa7f6568b768c652f8922c4e.zip
Merge remote-tracking branch 'origin/master' into lpc2012 branch
Diffstat (limited to 'mana.files')
-rw-r--r--mana.files4
1 files changed, 4 insertions, 0 deletions
diff --git a/mana.files b/mana.files
index 0871367e..8be24936 100644
--- a/mana.files
+++ b/mana.files
@@ -501,6 +501,8 @@ src/resources/resource.cpp
src/resources/resource.h
src/resources/resourcemanager.cpp
src/resources/resourcemanager.h
+src/resources/settingsmanager.cpp
+src/resources/settingsmanager.h
src/resources/soundeffect.cpp
src/resources/soundeffect.h
src/resources/specialdb.cpp
@@ -544,6 +546,8 @@ src/utils/mathutils.h
src/utils/mkdir.cpp
src/utils/mkdir.h
src/utils/mutex.h
+src/utils/path.cpp
+src/utils/path.h
src/utils/physfsrwops.c
src/utils/physfsrwops.h
src/utils/sha256.cpp