cc9cii 809b8c6d5b Conflicts: ... apps/opencs/view/render/pagedworldspacewidget.cpp		2014-10-12 05:54:21 +11:00
..
cell.cpp
cell.hpp
cellcoordinates.cpp
cellcoordinates.hpp
cellselection.cpp
cellselection.hpp
collection.hpp
collectionbase.cpp
collectionbase.hpp
columnbase.cpp
columnbase.hpp	Conflicts:	2014-10-12 05:54:21 +11:00
columnimp.hpp	Conflicts:	2014-10-12 05:54:21 +11:00
columns.cpp	Conflicts:	2014-10-12 05:54:21 +11:00
columns.hpp	Conflicts:	2014-10-12 05:54:21 +11:00
commanddispatcher.cpp
commanddispatcher.hpp
commands.cpp
commands.hpp
data.cpp	Conflicts:	2014-10-12 05:54:21 +11:00
data.hpp	Conflicts:	2014-10-12 05:54:21 +11:00
idcollection.hpp	Conflicts:	2014-10-12 05:54:21 +11:00
idtable.cpp	Avoid out of range exceptions.	2014-10-09 07:01:18 +11:00
idtable.hpp
idtablebase.cpp
idtablebase.hpp
idtableproxymodel.cpp	Use default sort until a more generic sort that uses numeric order can be implemented.	2014-10-08 07:59:21 +11:00
idtableproxymodel.hpp	Sort cell id column by numerical order.	2014-10-07 20:11:44 +11:00
info.hpp
infocollection.cpp
infocollection.hpp
land.cpp	Implement terrain rendering in OpenCS (Fixes #1597)	2014-10-08 17:17:31 +02:00
land.hpp	Implement terrain rendering in OpenCS (Fixes #1597)	2014-10-08 17:17:31 +02:00
landtexture.cpp	Implement terrain rendering in OpenCS (Fixes #1597)	2014-10-08 17:17:31 +02:00
landtexture.hpp	Implement terrain rendering in OpenCS (Fixes #1597)	2014-10-08 17:17:31 +02:00
pathgrid.cpp	Conflicts:	2014-10-12 05:54:21 +11:00
pathgrid.hpp	Conflicts:	2014-10-12 05:54:21 +11:00
record.cpp
record.hpp
ref.cpp
ref.hpp
refcollection.cpp
refcollection.hpp
refidadapter.cpp
refidadapter.hpp
refidadapterimp.cpp
refidadapterimp.hpp
refidcollection.cpp
refidcollection.hpp
refiddata.cpp
refiddata.hpp
regionmap.cpp
regionmap.hpp
resources.cpp
resources.hpp
resourcesmanager.cpp
resourcesmanager.hpp
resourcetable.cpp
resourcetable.hpp
scope.cpp
scope.hpp
scriptcontext.cpp
scriptcontext.hpp
subcellcollection.hpp	Conflicts:	2014-10-12 05:54:21 +11:00
tablemimedata.cpp
tablemimedata.hpp
universalid.cpp	Conflicts:	2014-10-12 05:54:21 +11:00
universalid.hpp	Conflicts:	2014-10-12 05:54:21 +11:00