Context Navigation

Changeset 2087 for code/trunk/src/orxonox/gui

Timestamp:

Nov 1, 2008, 7:04:09 PM (16 years ago)

Author:

landauf

Message:

merged objecthierarchy branch back to trunk

Location:

code/trunk

Files:

Property svn:mergeinfo changed

/code/branches/objecthierarchy (added)	merged: 1912,1916-1918,1938-1950,1952-1953,1955,1957-1962,1968-1970,1989-1990,1993-1994,2001-2013,2016-2020,2023-2035,2037,2039-2042,2044-2046,2048,2062-2067,2069-2075,2078-2080,2082,2084-2085
/code/branches/script_trigger (added)	merged: 1296,1307,1383,1541,1550,1671,1693,1851,1904,1906

r1887	r2087
47	47	#include "core/Core.h"
48	48	#include "tolua/tolua_bind.h"
49		~~#include "GraphicsEngine.h"~~
50	49	#include "OgreCEGUIRenderer.h"
51	50

r1755	r2087
25	25	*************************************************************************/
26	26
	27	#include "OrxonoxStableHeaders.h"
27	28	#include <CEGUIImagesetManager.h>
28	29	#include <CEGUIImageset.h>

r1755	r2087
24	24	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
25	25	*************************************************************************/
	26	#include "OrxonoxStableHeaders.h"
26	27	#include "OgreCEGUIResourceProvider.h"
27	28

r1755	r2087
25	25	*************************************************************************/
26	26
	27	#include "OrxonoxStableHeaders.h"
27	28	#include <CEGUISystem.h>
28	29	#include <CEGUIExceptions.h>

Note: See TracChangeset for help on using the changeset viewer.