propagate from internal tree

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/ZeroRadiant@191 8a3a26a2-13c4-0310-b231-cf6edde360e5
2007-11-05 13:28:33 +00:00
parent 64fe6940f0 d77fee7551
commit 0975f4af11
12 changed files with 136 additions and 1314 deletions
--- a/plugins/image/jpeg.cpp
+++ b/plugins/image/jpeg.cpp
@@ -42,12 +42,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <jpeglib.h>
 #include <jerror.h>
- /*
-extern "C" {
-#include "radiant_jpeglib.h"
-#include "jpeg6/jerror.h"
-}
- */

 #include "image.h"