propagate from internal tree

git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/branches/ZeroRadiant@191 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --cc plugins/image/jpeg.cpp
index db3d12c4456a6a0ac688cf8a7cc0e6fb0e137368,67a76541358cb2bd3b2c08d19794ff81e19d4225..0ced7628f741a0dd31a2e2454d07d187215d8513
--- 1/plugins/image/jpeg.cpp
--- 2/plugins/image/jpeg.cpp
+++ b/plugins/image/jpeg.cpp
@@@ -40,14 -40,10 +40,8 @@@ SOFTWARE, EVEN IF ADVISED OF THE POSSIB
  #include <string.h>
  #include <glib.h>
  
 -extern "C" {
 -#include "radiant_jpeglib.h"
 -#include "jpeg6/jerror.h"
 -}
 +#include <jpeglib.h>
 +#include <jerror.h>
-  /*
- extern "C" {
- #include "radiant_jpeglib.h"
- #include "jpeg6/jerror.h"
- }
-  */
  
  #include "image.h"
  

diff --cc plugins/imagepng/plugin.cpp
index e358312716a7b80e7cde6133748762e0665d0ccc,1a3cadc2b8e18ccfeaf93f362ab404aef3ca2874..fc797b306b3df35cbad3a0b8965d929d03882b82
--- 1/plugins/imagepng/plugin.cpp
--- 2/plugins/imagepng/plugin.cpp
+++ b/plugins/imagepng/plugin.cpp
@@@ -243,5 -238,5 +243,3 @@@ void LoadImage (const char *filename, u
    free(row_pointers);
    g_FileSystemTable.m_pfnFreeFile (fbuffer);
  }
--
--

diff --cc plugins/vfspak/vfspak.cpp
index 77c41c93a0422a836be7c42d08371df25ddc3a8b,832f062432773a426d88cf33c5460315091bc51c..e97280ac06f2e7dc9abe7db9fe3b4f15c02c561d
--- 1/plugins/vfspak/vfspak.cpp
--- 2/plugins/vfspak/vfspak.cpp
+++ b/plugins/vfspak/vfspak.cpp
@@@ -102,5 -97,5 +102,3 @@@ const char* CSynapseClientVFS::GetName(
  {
    return "VFS";
  }
--
--