]> git.xonotic.org Git - xonotic/netradiant.git/commitdiff
Merge branch 'master' into Mario/texturebrowser_fix
authorMario <mario@smbclan.net>
Tue, 11 Jul 2017 06:37:38 +0000 (16:37 +1000)
committerMario <mario@smbclan.net>
Tue, 11 Jul 2017 06:37:38 +0000 (16:37 +1000)
1  2 
radiant/mainframe.cpp
radiant/texwindow.cpp

Simple merge
Simple merge