cc9cii 312b7cd571 Merge branch 'master' into QtOGre ...

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp

2014-09-30 10:52:04 +10:00

..

bsa_archive.cpp

minor corrections

2014-08-12 13:31:20 +02:00

bsa_archive.hpp

Some unneeded includes cleanup

2014-01-15 14:53:28 +01:00

bsa_file.cpp

fix opening BSA on Unicode path

2014-05-19 13:39:07 +04:00

bsa_file.hpp

remove our stdint.h version that uses boost and force usage of system stdint.h

2014-03-05 17:08:58 +01:00

resources.cpp

moved resources group creation from Engine to bsa component

2014-03-09 11:42:39 +01:00

resources.hpp

moved resources group creation from Engine to bsa component

2014-03-09 11:42:39 +01:00