Lynix
0702e2e7bd
Merge remote-tracking branch 'origin/Audio-update'
Conflicts:
include/Nazara/Core/ResourceLoader.hpp
include/Nazara/Core/ResourceLoader.inl
src/Nazara/Audio/Loaders/sndfile/Loader.cpp
src/Nazara/Audio/Sound.cpp
src/Nazara/Utility/Loaders/MD2/Loader.cpp
src/Nazara/Utility/Loaders/MD5Anim/Loader.cpp
src/Nazara/Utility/Loaders/MD5Mesh/Loader.cpp
src/Nazara/Utility/Loaders/PCX/Loader.cpp
src/Nazara/Utility/Loaders/STB/Loader.cpp
Former-commit-id: e0706cc0feafb1ad182b8cc51e2b18f8f3664b97
2014-01-08 12:03:52 +01:00
..
2014-01-08 11:06:40 +01:00
2013-03-13 23:23:41 +01:00
2013-03-13 23:23:41 +01:00
2013-03-13 23:23:41 +01:00
2013-03-13 23:23:41 +01:00
2013-04-02 01:40:19 +02:00
2014-01-08 11:06:40 +01:00
2014-01-08 12:03:52 +01:00
2013-03-15 03:09:58 +01:00
2014-01-08 12:03:52 +01:00
2012-11-29 17:33:58 +01:00