]> git.xonotic.org Git - xonotic/netradiant.git/commit
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)
commit95f4573dfea77e12c302f9e6d37c810bd4a93ce8
tree0bc211f1c58dee15c8a839abcd4b71c4a95111e3
parentc39b971caffea529b9e8a39564dcb23e17bc6cf7
parente0b3d0ac5abc0cde0a74fadbd2aa4739b43b24a3
Merge branch 'master' into Mario/texturebrowser_fix
radiant/mainframe.cpp
radiant/texwindow.cpp