From: timo <timo@8a3a26a2-13c4-0310-b231-cf6edde360e5>
Date: Mon, 5 Nov 2007 13:28:33 +0000 (+0000)
Subject: propagate from internal tree
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=673a8590c9c570b5636e5a27a120adecd4ede26b;p=xonotic%2Fnetradiant.git

propagate from internal tree

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

673a8590c9c570b5636e5a27a120adecd4ede26b
diff --cc plugins/image/jpeg.cpp
index db3d12c4,67a76541..0ced7628
--- a/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 e3583127,1a3cadc2..fc797b30
--- a/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 77c41c93,832f0624..e97280ac
--- a/plugins/vfspak/vfspak.cpp
+++ b/plugins/vfspak/vfspak.cpp
@@@ -102,5 -97,5 +102,3 @@@ const char* CSynapseClientVFS::GetName(
  {
    return "VFS";
  }
--
--