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 12:03:52 +01:00
2014-01-08 10:48:23 +01:00
2013-12-28 10:22:03 +01:00
2013-07-03 01:17:22 +02:00
2013-12-20 19:59:28 +01:00
2013-03-13 23:23:41 +01:00
2013-06-24 13:33:54 +02:00
2013-12-26 11:33:01 +01:00
2013-12-20 20:03:18 +01:00
2014-01-08 12:03:52 +01:00
2013-12-20 20:03:18 +01:00
2013-03-13 23:23:41 +01:00
2013-03-13 23:23:41 +01:00
2013-12-28 10:22:03 +01:00
2013-12-20 20:03:18 +01:00
2013-12-20 20:03:18 +01:00
2013-12-20 20:03:18 +01:00
2013-12-20 20:03:18 +01:00
2014-01-05 15:28:57 +01:00
2013-12-20 20:03:18 +01:00
2013-12-20 20:03:18 +01:00