Planet

navi

home

PPS

about

screenshots

download

development

forum

Context Navigation

← Previous Change
Next Change →

Changeset 2442 for code/branches/physics_merge/src/orxonox/objects/weaponSystem

Timestamp:

Dec 14, 2008, 4:16:52 PM (16 years ago)

Author:

rgrieder

Message:

Finally merged physics stuff. Target is physics_merge because I'll have to do some testing first.

Location:

code/branches/physics_merge

Files:

: 3 edited

. (modified) (1 prop)
src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (1 prop)
src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (1 prop)

code/branches/physics_merge

Property svn:mergeinfo changed

/code/branches/physics (added)

merged: 1913,1919-1920,1922-1925,1933,1963-1967,1971-1974,1983-1988,1995,2047,2121-2122,2124,2141,2147-2151,2177-2179,2183-2185,2187-2190,2192,2201,2291-2292,2296-2306,2313-2315,2321,2323,2373-2374,2377,2403-2405,2407-2408,2421,2423-2427,2429-2434

code/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
code/branches/physics_merge/src/orxonox/objects/weaponSystem/WeaponSystem.h
- Property svn:mergeinfo changed
  /code/branches/physics/src/orxonox/objects/weaponSystem/WeaponSystem.h (added) merged: 2192

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

Download in other formats: