Marc Zinnschlag b157273cd9 Merge branch 'next' ...

Conflicts:
	apps/openmw/main.cpp

2011-07-31 19:28:12 +02:00

..

bsa

Merge branch 'components_namespaces' into next

2011-06-19 20:22:29 +02:00

compiler

redirecting output of expression evalutation to new report channel

2011-04-26 22:07:27 +02:00

esm

Added new command line option: "encoding"

2011-07-17 22:16:50 +02:00

esm_store

fix for issue 138 (record loading failed for some NPCs)

2011-07-04 23:36:22 +02:00

file_finder

more cleanup

2011-06-15 22:33:31 +02:00

files

Merge branch 'next'

2011-07-31 19:28:12 +02:00

interpreter

don't create a new virtual machine for each script and frame

2011-05-18 16:01:19 +02:00

misc

Mantis: #18 - Move components from global namespace into their own namespace.

2011-06-19 18:25:09 +02:00

nif

Merge branch 'components_namespaces' into next

2011-06-19 20:22:29 +02:00

nifbullet

Mantis: #18 - Move components from global namespace into their own namespace.

2011-06-19 18:45:23 +02:00

nifogre

Merge branch 'components_namespaces' into next

2011-06-19 20:22:29 +02:00

terrain

Remove no longer needed local .gitignore

2011-03-07 19:13:24 +01:00

to_utf8

Added new command line option: "encoding"

2011-07-17 22:16:50 +02:00

doc.hpp

second set of additional doxygen comments

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