Neil Roberts 6409b1adeb Merged clutter-ivan branch into trunk. ...

svn merge \
 https://svn.o-hand.com/repos/clutter/trunk/clutter@2509 \
 https://svn.o-hand.com/repos/clutter/branches/clutter-ivan@HEAD

2008-04-25 13:37:36 +00:00

..

cogl-bitmap-fallback.c

Merged clutter-ivan branch into trunk.

2008-04-25 13:37:36 +00:00

cogl-bitmap-pixbuf.c

Merged clutter-ivan branch into trunk.

2008-04-25 13:37:36 +00:00

cogl-bitmap.c

Merged clutter-ivan branch into trunk.

2008-04-25 13:37:36 +00:00

cogl-bitmap.h

Merged clutter-ivan branch into trunk.

2008-04-25 13:37:36 +00:00

cogl-util.c

Merged clutter-ivan branch into trunk.

2008-04-25 13:37:36 +00:00

cogl-util.h

Merged clutter-ivan branch into trunk.

2008-04-25 13:37:36 +00:00

Makefile.am

Merged clutter-ivan branch into trunk.

2008-04-25 13:37:36 +00:00

stb_image.c

Merged clutter-ivan branch into trunk.

2008-04-25 13:37:36 +00:00