[Orxonox-commit 753] r3282 - trunk/src/orxonox/interfaces

[landauf at orxonox.net]

Author: landauf
Date: 2009-07-13 14:37:03 +0200 (Mon, 13 Jul 2009)
New Revision: 3282

Modified:
   trunk/src/orxonox/interfaces/TeamColourable.h
Log:
removed mergeinfo property (please be careful with partial merges, those mergeinfo properties are a pain)


Property changes on: trunk/src/orxonox/interfaces/TeamColourable.h
___________________________________________________________________
Deleted: svn:mergeinfo
   - /branches/buildsystem/src/orxonox/interfaces/Teamcolourable.h:1875-2277,2279-2401
/branches/buildsystem2/src/orxonox/interfaces/Teamcolourable.h:2507-2659
/branches/buildsystem3/src/orxonox/interfaces/Teamcolourable.h:2663-2709
/branches/ceguilua/src/orxonox/interfaces/Teamcolourable.h:1803-1809
/branches/core3/src/orxonox/interfaces/Teamcolourable.h:1573-1740
/branches/core4/src/orxonox/interfaces/TeamColourable.h:3228,3235-3238,3243,3245-3251,3253-3255,3257,3260-3262,3265-3266,3269,3271,3278
/branches/gametypes/src/orxonox/interfaces/Teamcolourable.h:2827-3032
/branches/gcc43/src/orxonox/interfaces/Teamcolourable.h:1581
/branches/gui/src/orxonox/interfaces/Teamcolourable.h:1636-1724,2796-2895
/branches/input/src/orxonox/interfaces/Teamcolourable.h:1630-1637
/branches/lodfinal/src/orxonox/interfaces/Teamcolourable.h:2373-2412
/branches/map/src/orxonox/interfaces/Teamcolourable.h:2802-3087,3090
/branches/miniprojects/src/orxonox/interfaces/Teamcolourable.h:2755-2825
/branches/netp2/src/orxonox/interfaces/Teamcolourable.h:2836-2989
/branches/netp3/src/orxonox/interfaces/Teamcolourable.h:2989-3083
/branches/network/src/orxonox/interfaces/Teamcolourable.h:2357
/branches/network64/src/orxonox/interfaces/Teamcolourable.h:2211-2356
/branches/objecthierarchy/src/orxonox/interfaces/Teamcolourable.h:1912-2086,2101,2111-2170
/branches/objecthierarchy2/src/orxonox/interfaces/Teamcolourable.h:2172-2480
/branches/overlay/src/orxonox/interfaces/Teamcolourable.h:2118-2386
/branches/particles/src/orxonox/interfaces/Teamcolourable.h:2830-3086
/branches/physics/src/orxonox/interfaces/Teamcolourable.h:1913-2056,2108-2440
/branches/physics_merge/src/orxonox/interfaces/Teamcolourable.h:2437-2458
/branches/pickups/src/orxonox/interfaces/Teamcolourable.h:1927-2087,2128,2828-2916
/branches/pickups2/src/orxonox/interfaces/Teamcolourable.h:2108-2498,2916-3072
/branches/presentation/src/orxonox/interfaces/Teamcolourable.h:2370-2653,2655-2661
/branches/questsystem/src/orxonox/interfaces/Teamcolourable.h:1895-2089
/branches/questsystem2/src/orxonox/interfaces/Teamcolourable.h:2108-2260
/branches/questsystem5/src/orxonox/interfaces/Teamcolourable.h:2777-2906
/branches/script_trigger/src/orxonox/interfaces/Teamcolourable.h:1296-1954,1956
/branches/sound/src/orxonox/interfaces/Teamcolourable.h:2830-3011
/branches/weapon/src/orxonox/interfaces/Teamcolourable.h:1926-2095
/branches/weapon2/src/orxonox/interfaces/Teamcolourable.h:2108-2489
/branches/weapons/src/orxonox/interfaces/Teamcolourable.h:2898-3052
/branches/weaponsystem/src/orxonox/interfaces/Teamcolourable.h:2743-2891