Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 1, 2009, 10:24:27 PM (16 years ago)
Author:
scheusso
Message:

applying change from trunk (r2946)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/netp2/src/OrxonoxConfig.h.in

    • Property svn:mergeinfo set to (toggle deleted branches)
      /code/branches/gui/src/OrxonoxConfig.h.inmergedeligible
      /code/branches/pickups/src/OrxonoxConfig.h.inmergedeligible
      /code/branches/pickups2/src/OrxonoxConfig.h.inmergedeligible
      /code/trunk/src/OrxonoxConfig.h.inmergedeligible
      /code/branches/buildsystem/src/OrxonoxConfig.h.in1874-2276,​2278-2400
      /code/branches/buildsystem2/src/OrxonoxConfig.h.in2506-2658
      /code/branches/buildsystem3/src/OrxonoxConfig.h.in2662-2708
      /code/branches/ceguilua/src/OrxonoxConfig.h.in1802-1808
      /code/branches/core3/src/OrxonoxConfig.h.in1572-1739
      /code/branches/gcc43/src/OrxonoxConfig.h.in1580
      /code/branches/input/src/OrxonoxConfig.h.in1629-1636
      /code/branches/lodfinal/src/OrxonoxConfig.h.in2372-2411
      /code/branches/miniprojects/src/OrxonoxConfig.h.in2754-2824
      /code/branches/network/src/OrxonoxConfig.h.in2356
      /code/branches/network64/src/OrxonoxConfig.h.in2210-2355
      /code/branches/objecthierarchy/src/OrxonoxConfig.h.in1911-2085,​2100,​2110-2169
      /code/branches/objecthierarchy2/src/OrxonoxConfig.h.in2171-2479
      /code/branches/overlay/src/OrxonoxConfig.h.in2117-2385
      /code/branches/physics/src/OrxonoxConfig.h.in1912-2055,​2107-2439
      /code/branches/physics_merge/src/OrxonoxConfig.h.in2436-2457
      /code/branches/presentation/src/OrxonoxConfig.h.in2369-2652,​2654-2660
      /code/branches/questsystem/src/OrxonoxConfig.h.in1894-2088
      /code/branches/questsystem2/src/OrxonoxConfig.h.in2107-2259
      /code/branches/script_trigger/src/OrxonoxConfig.h.in1295-1953,​1955
      /code/branches/weapon/src/OrxonoxConfig.h.in1925-2094
      /code/branches/weapon2/src/OrxonoxConfig.h.in2107-2488
    r2797 r2947  
    142142
    143143/*---------------------------------
     144 * Special Macros
     145 *-------------------------------*/
     146#define MACRO_CONCATENATE_AUX(a, b) a##b
     147#define MACRO_CONCATENATE(a, b) MACRO_CONCATENATE_AUX(a, b)
     148#define MACRO_QUOTEME_AUX(x) #x
     149#define MACRO_QUOTEME(x) MACRO_QUOTEME_AUX(x)
     150
     151
     152/*---------------------------------
    144153 * Includes
    145154 *-------------------------------*/
Note: See TracChangeset for help on using the changeset viewer.