]> 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: ecf04f0 2a3c3ee)
Merge remote-tracking branch 'origin/terencehill/music_player' into terencehill/music...
authorterencehill <piuntn@gmail.com>
Tue, 6 Aug 2013 00:24:47 +0000 (02:24 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 6 Aug 2013 00:24:47 +0000 (02:24 +0200)
Conflicts:
qcsrc/menu/xonotic/playlist.c


Trivial merge