]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/menu/xonotic/dialog_hudpanel_notification.c
Merge remote-tracking branch 'origin/master' into samual/orthoview
authorSamual Lenks <samual@xonotic.org>
Sun, 15 Sep 2013 02:54:15 +0000 (22:54 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 15 Sep 2013 02:54:15 +0000 (22:54 -0400)
commit743ade47f343fb633224fe3141b01252030d4ddd
tree66d203e9b16d5a5397bd1aeeebf5014394102466
parentfeea85f4c6e7e8a068dc22ac280652fc670ad257
parente2d636eb8c05657a447aaec494ae580d1c31a4ba
Merge remote-tracking branch 'origin/master' into samual/orthoview