Changeset 2966 for code/branches/sound/src/orxonox/sound/SoundBase.h
- Timestamp:
- May 11, 2009, 2:30:54 PM (15 years ago)
- Location:
- code/branches/sound/src/orxonox/sound
- Files:
-
- 1 added
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/sound/src/orxonox/sound/SoundBase.h
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/buildsystem/src/sound/SoundBase.h 1874-2276,2278-2400 /code/branches/buildsystem2/src/sound/SoundBase.h 2506-2658 /code/branches/buildsystem3/src/sound/SoundBase.h 2662-2708 /code/branches/ceguilua/src/sound/SoundBase.h 1802-1808 /code/branches/core3/src/sound/SoundBase.h 1572-1739 /code/branches/gcc43/src/sound/SoundBase.h 1580 /code/branches/gui/src/sound/SoundBase.h 1635-1723 /code/branches/input/src/sound/SoundBase.h 1629-1636 /code/branches/lodfinal/src/sound/SoundBase.h 2372-2411 /code/branches/miniprojects/src/sound/SoundBase.h 2754-2824 /code/branches/network/src/sound/SoundBase.h 2356 /code/branches/network64/src/sound/SoundBase.h 2210-2355 /code/branches/objecthierarchy/src/sound/SoundBase.h 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/sound/SoundBase.h 2171-2479 /code/branches/overlay/src/sound/SoundBase.h 2117-2385 /code/branches/physics/src/sound/SoundBase.h 1912-2055,2107-2439 /code/branches/physics_merge/src/sound/SoundBase.h 2436-2457 /code/branches/pickups/src/sound/SoundBase.h 1926-2086,2127 /code/branches/pickups2/src/sound/SoundBase.h 2107-2497 /code/branches/presentation/src/sound/SoundBase.h 2369-2652,2654-2660 /code/branches/questsystem/src/sound/SoundBase.h 1894-2088 /code/branches/questsystem2/src/sound/SoundBase.h 2107-2259 /code/branches/script_trigger/src/sound/SoundBase.h 1295-1953,1955 /code/branches/weapon/src/sound/SoundBase.h 1925-2094 /code/branches/weapon2/src/sound/SoundBase.h 2107-2488
r2963 r2966 42 42 * 43 43 */ 44 class SoundBase44 class _OrxonoxExport SoundBase 45 45 { 46 46 public: 47 47 SoundBase(); 48 48 SoundBase(WorldEntity* entity); 49 ~SoundBase(); 49 50 50 51 void attachToEntity(WorldEntity* entity); -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.