diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-01-03 23:18:05 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-01-03 23:19:29 +0100 |
| commit | b9fbd8529d6aa8d8f229eae81b16134de07db346 (patch) | |
| tree | ceea6eecbd26c973441ee5f4f05362fd78c72cb0 /mana.files | |
| parent | 0bb9a42066e4cf0f9fbc83fa2e742053dc40f1d4 (diff) | |
| parent | 2851c8962522a4e8f8b62a498b113dc6b1eab56d (diff) | |
| download | mana-b9fbd8529d6aa8d8f229eae81b16134de07db346.tar.gz mana-b9fbd8529d6aa8d8f229eae81b16134de07db346.tar.bz2 mana-b9fbd8529d6aa8d8f229eae81b16134de07db346.tar.xz mana-b9fbd8529d6aa8d8f229eae81b16134de07db346.zip | |
Merge branch '0.5'
Conflicts:
po/es.po
po/fr.po
src/net/tmwa/adminhandler.cpp
update-creator.sh
Diffstat (limited to 'mana.files')
| -rw-r--r-- | mana.files | 27 |
1 files changed, 12 insertions, 15 deletions
@@ -5,43 +5,43 @@ ./CMakeLists.txt ./data/CMakeLists.txt ./data/fonts/CMakeLists.txt -./data/fonts/Makefile.am ./data/graphics/CMakeLists.txt ./data/graphics/gui/CMakeLists.txt ./data/graphics/gui/colors.xml -./data/graphics/gui/Makefile.am ./data/graphics/gui/speechbubble.xml ./data/graphics/gui/window.xml ./data/graphics/images/CMakeLists.txt -./data/graphics/images/Makefile.am -./data/graphics/Makefile.am ./data/graphics/sprites/CMakeLists.txt ./data/graphics/sprites/error.xml -./data/graphics/sprites/Makefile.am ./data/help/about.txt ./data/help/changes.txt ./data/help/CMakeLists.txt ./data/help/commands.txt ./data/help/header.txt ./data/help/index.txt -./data/help/Makefile.am -./data/help/skills.txt ./data/help/support.txt -./data/help/team.txt ./data/help/windows.txt ./data/icons/CMakeLists.txt -./data/icons/Makefile.am -./data/Makefile.am ./docs/clientupdates.txt ./docs/example.mana ./docs/FAQ.txt ./docs/HACKING.txt ./docs/items.txt -./docs/Makefile.am ./docs/packages.txt ./docs/progression.txt ./docs/sounddev.txt -./Makefile.am +./libs/enet/CMakeLists.txt +./libs/enet/design.txt +./libs/enet/include/enet/callbacks.h +./libs/enet/include/enet/enet.h +./libs/enet/include/enet/list.h +./libs/enet/include/enet/protocol.h +./libs/enet/include/enet/time.h +./libs/enet/include/enet/types.h +./libs/enet/include/enet/unix.h +./libs/enet/include/enet/utility.h +./libs/enet/include/enet/win32.h +./packaging/windows/portable.xml ./packaging/windows/readme.txt ./po/CMakeLists.txt ./src/actor.cpp @@ -315,7 +315,6 @@ ./src/log.h ./src/main.cpp ./src/main.h -./src/Makefile.am ./src/map.cpp ./src/map.h ./src/net/adminhandler.h @@ -462,8 +461,6 @@ ./src/resources/action.h ./src/resources/ambientlayer.cpp ./src/resources/ambientlayer.h -./src/resources/ambientoverlay.cpp -./src/resources/ambientoverlay.h ./src/resources/animation.cpp ./src/resources/animation.h ./src/resources/beinginfo.cpp |