]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'TimePath/issues/1438,1439' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 29 Dec 2014 00:50:51 +0000 (00:50 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 29 Dec 2014 00:50:51 +0000 (00:50 +0000)
commitf2fe6110952eb06529262b100313713451c0a36b
tree248782d0490dfcb453996ab2f5df52981172bd76
parenta8167f39b0867a3a820b7c01b30434c158b42b03
parentecf545589f9da4da54378cb19bfdc377363276bf
Merge branch 'TimePath/issues/1438,1439' into 'master'

Jetpack spam

Fixes #1438 and #1439

See merge request !74