Joseph Eagar de7f08cc41 merge with 2.5 at r22793

2009-08-26 10:27:04 +00:00

..

image_buttons.c

2.5 Texture paint:

2009-08-17 04:40:59 +00:00

image_draw.c

2.5 Texture paint:

2009-08-17 04:40:59 +00:00

image_header.c

merge with 2.5 (not trunk, last merge message said that on accident) at r22252

2009-08-06 09:56:14 +00:00

image_intern.h

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

image_ops.c

2.5: File browser

2009-07-28 16:46:14 +00:00

image_render.c

Colour Management

2009-07-17 02:43:15 +00:00

Makefile

merge with 2.5 at r22793

2009-08-26 10:27:04 +00:00

SConscript

merge with 2.5 at r22793

2009-08-26 10:27:04 +00:00

space_image.c

merge with 2.5 (not trunk, last merge message said that on accident) at r22252

2009-08-06 09:56:14 +00:00