Merge commit 'c3765eb6e7f6879e5a34c48f71e5ee7bc8b8851f' into master-merge

diff --cc Makefile
Simple merge

diff --cc contrib/camera/camera.cpp
Simple merge

diff --cc radiant/CMakeLists.txt
index f93b00cf1329a8662fb132c1cd897372a38808a9,1edced736eade534b52a073ac430bd96d805b16d..08e76bcf0a839f78b90ca38f14ca5432df6b263e
--- 1/radiant/CMakeLists.txt
--- 2/radiant/CMakeLists.txt
+++ b/radiant/CMakeLists.txt
@@@ -34,8 -34,10 +34,9 @@@ set(RADIANTLIS
      error.cpp error.h
      feedback.cpp feedback.h
      filetypes.cpp filetypes.h
+     filterbar.cpp filterbar.h
      filters.cpp filters.h
      findtexturedialog.cpp findtexturedialog.h
 -    glwidget.cpp glwidget.h
      grid.cpp grid.h
      groupdialog.cpp groupdialog.h
      gtkdlgs.cpp gtkdlgs.h

diff --cc radiant/environment.cpp
Simple merge

diff --cc radiant/environment.h
Simple merge

diff --cc radiant/main.cpp
Simple merge

diff --cc radiant/mainframe.cpp
index f87f4725bbd5ad5ad9cd462b9661d57d8373e0fe,196a60df37464afe89faf0d1cb1f3246cb99a7c3..be1e985049d7ee19577a8613ef5c7527b7fe73d6
--- 1/radiant/mainframe.cpp
--- 2/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@@ -100,19 -100,8 +100,20 @@@
  #include "feedback.h"
  #include "referencecache.h"
  #include "texwindow.h"
+ #include "filterbar.h"
  
 +#if GDEF_OS_WINDOWS
 +#include <process.h>
 +#else
 +#include <spawn.h>
 +#endif
 +
 +#ifdef WORKAROUND_WINDOWS_GTK2_GLWIDGET
 +/* workaround for gtk 2.24 issue: not displayed glwidget after toggle */
 +#define WORKAROUND_GOBJECT_SET_GLWIDGET(window, widget) g_object_set_data( G_OBJECT( window ), "glwidget", G_OBJECT( widget ) )
 +#else
 +#define WORKAROUND_GOBJECT_SET_GLWIDGET(window, widget)
 +#endif
  
  struct layout_globals_t
  {

diff --cc radiant/plugintoolbar.cpp
Simple merge