griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
6a9fcfd6fa7fb682cd3da8a2150bed2e13bda9c7
test2/extern/libopenjpeg
History
Tamito Kajiyama be50ce61be Merged 
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).

After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
2009-09-18 22:25:49 +00:00
..
patches
== redcode ==
2008-06-10 05:12:51 +00:00
bio.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
bio.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
cio.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
cio.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
CMakeLists.txt
Merged
2009-09-18 22:25:49 +00:00
dwt.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
dwt.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
event.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
event.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
fix.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
image.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
image.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
int.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
j2k_lib.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
j2k_lib.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
j2k.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
j2k.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
jp2.c
Merged
2009-09-18 22:25:49 +00:00
jp2.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
jpt.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
jpt.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
license.txt
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
Makefile
Merged
2009-09-18 22:25:49 +00:00
mct.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
mct.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
mqc.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
mqc.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
openjpeg.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
openjpeg.h
Merged
2009-09-18 22:25:49 +00:00
opj_includes.h
Merged
2009-09-18 22:25:49 +00:00
opj_malloc.h
== redcode ==
2008-06-10 05:12:51 +00:00
pi.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
pi.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
raw.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
raw.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
SConscript
Merged
2009-09-18 22:25:49 +00:00
t1_luts.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
t1.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
t1.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
t2.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
t2.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
tcd.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
tcd.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
tgt.c
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00
tgt.h
== RED one (redcode) ==
2008-06-02 21:35:57 +00:00