]> git.xonotic.org Git - xonotic/netradiant.git/commit
Merge branch 'master' into Melanosuchus/cmake
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 22 Jan 2016 06:54:45 +0000 (17:54 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 22 Jan 2016 06:54:45 +0000 (17:54 +1100)
commit940ca0c11718a95d34c9614e8533f066896c890f
treeff4d69d971b90d09f4dd640aaca819efb8872682
parent7dbf89056c0b7b7889822831ba5bf5329a492e9d
parentdaea7eb81791e51cb87534dcc627cbe012104f5d
Merge branch 'master' into Melanosuchus/cmake

# Conflicts:
# radiant/mainframe.cpp
# radiant/texwindow.cpp
13 files changed:
Makefile
contrib/bobtoolz/bobToolz-GTK.cpp
contrib/camera/camera.cpp
contrib/ufoaiplug/ufoai_gtk.cpp
libs/gtkutil/image.cpp
libs/shaderlib.h
libs/string/string.h
plugins/shaders/shaders.cpp
radiant/camwindow.cpp
radiant/gtkdlgs.cpp
radiant/mainframe.cpp
radiant/patchmanip.cpp
radiant/texwindow.cpp