]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 6603ee5 a7cad9d)
Merge branch 'Mario/bulldozer' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 16 Nov 2015 08:16:10 +0000 (08:16 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 16 Nov 2015 08:16:10 +0000 (08:16 +0000)
Merge branch Mario/bulldozer (M merge request)

Bulldozer (Sokoban) minigame.

Assets are all from OpenClipArt, license should be fine.

See merge request !258


Trivial merge