From b089fc559a5dc527ed5e0422e82abf3b1dd5f1b2 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Fri, 28 Sep 2007 23:32:53 +0000 Subject: EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release ** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release ** ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556 RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa --- indra/llimagej2coj/llimagej2coj.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/llimagej2coj') diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index 68a3152f0a..7def8ca07f 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -10,7 +10,6 @@ #include "llimagej2coj.h" // this is defined so that we get static linking. -#define OPJ_STATIC #include "openjpeg/openjpeg.h" #include "lltimer.h" -- cgit v1.2.3