From: Mario <zacjardine@y7mail.com>
Date: Mon, 16 Nov 2015 08:16:10 +0000 (+0000)
Subject: Merge branch 'Mario/bulldozer' into 'master'
X-Git-Tag: xonotic-v0.8.2~1654
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=29423d45cc63c4a88be57ceddff708a9c48d9fb1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/bulldozer' into 'master'

Merge branch Mario/bulldozer (M merge request)

Bulldozer (Sokoban) minigame.

Assets are all from OpenClipArt, license should be fine.

See merge request !258
---

29423d45cc63c4a88be57ceddff708a9c48d9fb1