Marc Zinnschlag
c995533e07
Merge branch 'dialogue' into saving
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
2013-10-21 16:45:43 +02:00
..
2013-09-27 10:08:09 +02:00
2013-09-14 14:56:23 +02:00
2013-09-27 10:08:09 +02:00
2013-09-14 14:56:23 +02:00
2013-09-27 10:08:09 +02:00
2013-09-14 14:56:23 +02:00
2013-06-17 11:42:02 +02:00
2013-09-14 14:56:23 +02:00
2013-09-27 10:08:09 +02:00
2013-09-14 14:56:23 +02:00
2013-09-27 10:08:09 +02:00
2013-09-14 14:56:23 +02:00
2012-12-12 22:36:20 +01:00
2012-12-12 22:36:20 +01:00
2013-09-27 10:08:09 +02:00
2013-09-14 14:56:23 +02:00
2013-09-27 10:08:09 +02:00
2013-09-14 14:56:23 +02:00
2013-09-27 10:08:09 +02:00
2013-09-14 14:56:23 +02:00
2013-09-15 11:35:12 +02:00
2013-09-15 11:35:12 +02:00