Merge branch 'master' into Melanosuchus/cmake

# Conflicts:
#	radiant/mainframe.cpp
#	radiant/texwindow.cpp

diff --cc Makefile
Simple merge

diff --cc contrib/bobtoolz/bobToolz-GTK.cpp
Simple merge

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

diff --cc contrib/ufoaiplug/ufoai_gtk.cpp
Simple merge

diff --cc libs/gtkutil/image.cpp
Simple merge

diff --cc libs/shaderlib.h
Simple merge

diff --cc libs/string/string.h
Simple merge

diff --cc plugins/shaders/shaders.cpp
Simple merge

diff --cc radiant/camwindow.cpp
Simple merge

diff --cc radiant/gtkdlgs.cpp
Simple merge

diff --cc radiant/mainframe.cpp
index 6762360b4cdc08fcb2adba34591f66db5d3ef84d,a91dccdd93f8245ba377fc7b9b5ba71436ac142e..bd512582607a8dcbe59957cdcaf079abc31fd356
--- 1/radiant/mainframe.cpp
--- 2/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@@ -2379,14 -2381,14 +2381,14 @@@ GtkToolbar* create_main_toolbar( MainFr
  
        gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
  
-       /*GtkButton* g_view_entities_button =*/ toolbar_append_button( toolbar, "Entities (N)", "entities.bmp", "ToggleEntityInspector" );
-       GtkButton* g_view_console_button = toolbar_append_button( toolbar, "Console (O)", "console.bmp", "ToggleConsole" );
-       GtkButton* g_view_textures_button = toolbar_append_button( toolbar, "Texture Browser (T)", "texture_browser.bmp", "ToggleTextures" );
 -      GtkButton* g_view_entities_button = toolbar_append_button( toolbar, "Entities (N)", "entities.png", "ToggleEntityInspector" );
++      /*GtkButton* g_view_entities_button =*/ toolbar_append_button( toolbar, "Entities (N)", "entities.png", "ToggleEntityInspector" );
+       GtkButton* g_view_console_button = toolbar_append_button( toolbar, "Console (O)", "console.png", "ToggleConsole" );
+       GtkButton* g_view_textures_button = toolbar_append_button( toolbar, "Texture Browser (T)", "texture_browser.png", "ToggleTextures" );
        // TODO: call light inspector
-       //GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.bmp", "ToggleLightInspector");
+       //GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.png", "ToggleLightInspector");
  
        gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
-       /*GtkButton* g_refresh_models_button =*/ toolbar_append_button( toolbar, "Refresh Models", "refresh_models.bmp", "RefreshReferences" );
 -      GtkButton* g_refresh_models_button = toolbar_append_button( toolbar, "Refresh Models", "refresh_models.png", "RefreshReferences" );
++      /*GtkButton* g_refresh_models_button =*/ toolbar_append_button( toolbar, "Refresh Models", "refresh_models.png", "RefreshReferences" );
  
  
        // disable the console and texture button in the regular layouts

diff --cc radiant/patchmanip.cpp
Simple merge

diff --cc radiant/texwindow.cpp
index cf3fa3bedaa999fd243cbf6224138e387dbd533b,33e7e5c257d8ef227a6e13f75fffa9cf2868953a..436377f19213d370eda4e579b605b6b920e28377
--- 1/radiant/texwindow.cpp
--- 2/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@@ -1927,11 -1927,11 +1927,11 @@@ void TextureBrowser_checkTagFile()
  
  void TextureBrowser_SetNotex(){
        StringOutputStream name( 256 );
-       name << GlobalRadiant().getAppPath() << "bitmaps/notex.bmp";
+       name << GlobalRadiant().getAppPath() << "bitmaps/notex.png";
        g_notex = name.c_str();
  
 -      name = NULL;
 +      name = StringOutputStream();
-       name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.bmp";
+       name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.png";
        g_shadernotex = name.c_str();
  }