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
..
2010-06-25 22:28:59 +02:00
2010-06-25 22:28:59 +02:00
2012-07-09 21:08:23 -07:00
2012-07-10 03:52:01 -07:00
2012-07-14 09:20:09 -07:00
2012-07-10 04:45:14 -07:00
2012-07-10 04:21:47 -07:00
2012-07-16 13:16:11 -07:00
2012-07-17 10:57:15 -07:00
2012-07-12 11:21:52 -07:00
2012-07-15 15:23:49 -07:00
2012-07-10 04:45:14 -07:00
2012-07-12 05:37:56 -07:00
2012-07-12 12:01:11 -07:00