]> git.xonotic.org Git - xonotic/netradiant.git/commit
Merge branch 'master' into Mario/texturebrowser_fix
authorMario <mario@smbclan.net>
Sun, 12 Mar 2017 19:56:11 +0000 (05:56 +1000)
committerMario <mario@smbclan.net>
Sun, 12 Mar 2017 19:56:11 +0000 (05:56 +1000)
commitc39b971caffea529b9e8a39564dcb23e17bc6cf7
tree14e48fa8c2180351a9083ca2fb3846adcfc556dc
parent8e4989b0297b5c09855be08aa1b2acf78401e551
parentdaa584caa15991aa216456dddb2b78abbe34d9d3
Merge branch 'master' into Mario/texturebrowser_fix