Planet

navi

home

PPS

about

screenshots

download

development

forum

Context Navigation

← Previous Change
Next Change →

Changeset 12184 for code/branches/Merge_HS18/src/modules/weapons/weaponmodes

Timestamp:

Dec 11, 2018, 6:53:27 PM (6 years ago)

Author:

merholzl

Message:

Wagnis Merge

Location:

code/branches/Merge_HS18

Files:

: 2 edited
: 2 copied

. (modified) (1 prop)
src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
src/modules/weapons/weaponmodes/WagnisGun.cc (copied) (copied from code/branches/wagnis_HS18/src/modules/weapons/weaponmodes/WagnisGun.cc)
src/modules/weapons/weaponmodes/WagnisGun.h (copied) (copied from code/branches/wagnis_HS18/src/modules/weapons/weaponmodes/WagnisGun.h)

Legend:

: Unmodified
: Added
: Removed

code/branches/Merge_HS18

Property svn:mergeinfo changed

/code/branches/wagnis_HS18 (added)

merged: 12035,12048-12052,12067-12069,12072,12077,12080,12100,12102-12105,12107,12109,12114,12118-12119,12124,12127,12129-12130,12132-12136,12145,12150,12157-12164,12169-12174

code/branches/Merge_HS18/src/modules/weapons/weaponmodes/CMakeLists.txt

r11108	r12184
13	13	GravityBombFire.cc
14	14	MineGun.cc
	15	WagnisGun.cc
15	16	)

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

Download in other formats: