Merge branch 'openmw-033'

apps/opencs/view/render/cell.hpp

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <map>
+#include <memory>
 
 #include <OgreVector3.h>
 

readme.txt

@@ -197,14 +197,12 @@ Bug #2029: Ienith Brothers Thiev's Guild quest journal entry not adding
 Feature #471: Editor: Special case implementation for top-level window with single sub-window
 Feature #472: Editor: Sub-Window re-use settings
 Feature #704: Font colors import from fallback settings
-Feature #854: Editor: Add user setting to show status bar
 Feature #879: Editor: Open sub-views in a new top-level window
 Feature #932: Editor: magic effect table
 Feature #937: Editor: Path Grid table
 Feature #938: Editor: Sound Gen table
 Feature #1117: Death and LevelUp music
 Feature #1226: Editor: Request UniversalId editing from table columns
-Feature #1310: Editor: Rendering User Settings
 Feature #1545: Targeting console on player
 Feature #1597: Editor: Render terrain
 Feature #1695: Editor: add column for CellRef's global variable