scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwgui/mainmenu.cpp apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/debugging.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/sky.cpp components/nif/nifkey.hpp components/nif/nifstream.hpp components/nifbullet/bulletnifloader.cpp components/nifogre/ogrenifloader.hpp libs/openengine/bullet/physic.cpp libs/openengine/gui/manager.cpp		2015-05-04 02:41:50 +02:00
..
activespells.cpp
activespells.hpp
aipackage.cpp
aipackage.hpp
aisequence.cpp
aisequence.hpp
attr.cpp
attr.hpp
cellid.cpp
cellid.hpp
cellref.cpp
cellref.hpp
cellstate.cpp
cellstate.hpp
containerstate.cpp
containerstate.hpp
creaturelevliststate.cpp
creaturelevliststate.hpp
creaturestate.cpp
creaturestate.hpp
creaturestats.cpp
creaturestats.hpp
custommarkerstate.cpp
custommarkerstate.hpp
debugprofile.cpp
debugprofile.hpp
defs.hpp
dialoguestate.cpp
dialoguestate.hpp
doorstate.cpp
doorstate.hpp
effectlist.cpp
effectlist.hpp
esmcommon.hpp
esmreader.cpp
esmreader.hpp
esmwriter.cpp
esmwriter.hpp
filter.cpp
filter.hpp
fogstate.cpp
fogstate.hpp
globalmap.cpp
globalmap.hpp
globalscript.cpp
globalscript.hpp
inventorystate.cpp
inventorystate.hpp
journalentry.cpp
journalentry.hpp
loadacti.cpp
loadacti.hpp
loadalch.cpp
loadalch.hpp
loadappa.cpp
loadappa.hpp
loadarmo.cpp
loadarmo.hpp
loadbody.cpp
loadbody.hpp
loadbook.cpp
loadbook.hpp
loadbsgn.cpp
loadbsgn.hpp
loadcell.cpp
loadcell.hpp
loadclas.cpp
loadclas.hpp
loadclot.cpp
loadclot.hpp
loadcont.cpp
loadcont.hpp
loadcrea.cpp
loadcrea.hpp
loaddial.cpp
loaddial.hpp
loaddoor.cpp
loaddoor.hpp
loadench.cpp
loadench.hpp
loadfact.cpp
loadfact.hpp
loadglob.cpp
loadglob.hpp
loadgmst.cpp
loadgmst.hpp
loadinfo.cpp
loadinfo.hpp
loadingr.cpp
loadingr.hpp
loadland.cpp
loadland.hpp
loadlevlist.cpp
loadlevlist.hpp
loadligh.cpp
loadligh.hpp
loadlock.cpp
loadlock.hpp
loadltex.cpp
loadltex.hpp
loadmgef.cpp
loadmgef.hpp
loadmisc.cpp
loadmisc.hpp
loadnpc.cpp
loadnpc.hpp
loadpgrd.cpp
loadpgrd.hpp
loadprob.cpp
loadprob.hpp
loadrace.cpp
loadrace.hpp
loadregn.cpp
loadregn.hpp
loadrepa.cpp
loadrepa.hpp
loadscpt.cpp
loadscpt.hpp
loadskil.cpp
loadskil.hpp
loadsndg.cpp
loadsndg.hpp
loadsoun.cpp
loadsoun.hpp
loadspel.cpp
loadspel.hpp
loadsscr.cpp
loadsscr.hpp
loadstat.cpp
loadstat.hpp
loadtes3.cpp
loadtes3.hpp
loadweap.cpp
loadweap.hpp
locals.cpp
locals.hpp
magiceffects.cpp
magiceffects.hpp
npcstate.cpp
npcstate.hpp
npcstats.cpp
npcstats.hpp
objectstate.cpp
objectstate.hpp
player.cpp
player.hpp
projectilestate.cpp
projectilestate.hpp
queststate.cpp
queststate.hpp
quickkeys.cpp
quickkeys.hpp
records.hpp
savedgame.cpp
savedgame.hpp
spelllist.cpp
spelllist.hpp
spellstate.cpp
spellstate.hpp
statstate.hpp
stolenitems.cpp
stolenitems.hpp
transport.cpp
transport.hpp
util.hpp
variant.cpp
variant.hpp
variantimp.cpp
variantimp.hpp
weatherstate.cpp
weatherstate.hpp