]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f1297c 5e7f152)
Merge remote-tracking branch 'origin/sev/hud_panel_notify'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 4 Oct 2014 20:23:10 +0000 (22:23 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 4 Oct 2014 20:23:10 +0000 (22:23 +0200)

Trivial merge