IM Code

Brought to you by: scuri

Commit [r229] Maximize Restore History

# New: function imImageMergeAttributes.

Authored by: scuri 2011-04-04

Browse code at this revision

Parent: [r228]

Child: [r230]

changed	/trunk/im/html/en/history.html
changed	/trunk/im/include/im_attrib.h
changed	/trunk/im/include/im_attrib_flat.h
changed	/trunk/im/include/im_image.h
changed	/trunk/im/src/im.def
changed	/trunk/im/src/im_attrib.cpp
changed	/trunk/im/src/im_image.cpp
changed	/trunk/im/src/lua5/imlua_image.c

/trunk/im/html/en/history.html Diff Switch to side-by-side view

/trunk/im/include/im_attrib.h Diff Switch to side-by-side view

/trunk/im/include/im_attrib_flat.h Diff Switch to side-by-side view

/trunk/im/include/im_image.h Diff Switch to side-by-side view

/trunk/im/src/im.def Diff Switch to side-by-side view

/trunk/im/src/im_attrib.cpp Diff Switch to side-by-side view

/trunk/im/src/im_image.cpp Diff Switch to side-by-side view

/trunk/im/src/lua5/imlua_image.c Diff Switch to side-by-side view