Chris Robinson 6047dc6a0c Merge remote branch 'zini/master' into nif-cleanup ...

Conflicts:
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/animation.hpp
	apps/openmw/mwrender/creatureanimation.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/npcanimation.hpp
	components/nifogre/ogre_nif_loader.hpp

2012-07-17 10:57:15 -07:00

..

bsa

Merge remote branch 'zini/master' into nif-cleanup

2012-07-17 10:57:15 -07:00

compiler

Mostly removal of unnecessary #include's and a little clean up

2012-07-17 09:27:12 +02:00

esm

Merge branch 'master' into potions

2012-07-17 10:32:18 +02:00

esm_store

Merge branch 'master' into potions

2012-07-17 10:32:18 +02:00

file_finder

Issue #133 Handle resources across multiple data directories

2012-02-12 14:21:07 +01:00

files

Mostly removal of unnecessary #include's and a little clean up

2012-07-17 09:27:12 +02:00

interpreter

Issue #181: assignment to member variables

2012-06-16 14:29:55 +02:00

misc

Changed standard C lib includes to C++ format

2012-07-17 09:44:24 +02:00

nif

Merge remote branch 'zini/master' into nif-cleanup

2012-07-17 10:57:15 -07:00

nifbullet

Merge remote branch 'zini/master' into nif-cleanup

2012-07-17 10:57:15 -07:00

nifogre

Merge remote branch 'zini/master' into nif-cleanup

2012-07-17 10:57:15 -07:00

nifoverrides

override nif transparency settings (part 1)

2012-04-11 20:13:15 +02:00

settings

fix some settings bugs

2012-06-23 12:25:28 +02:00

terrain

Changed standard C lib includes to C++ format

2012-07-17 09:44:24 +02:00

to_utf8

Changed standard C lib includes to C++ format

2012-07-17 09:44:24 +02:00

CMakeLists.txt

fix link error with recent glibc versions

2012-07-15 21:27:57 +02:00

doc.hpp

second set of additional doxygen comments

2010-09-25 20:15:05 +02:00