Jinhao 7d868f2377 Merge branch 'develop' of https://github.com/beru/nana into beru-develop ...

Conflicts:
	source/gui/widgets/skeletons/text_editor.cpp
	source/gui/widgets/textbox.cpp
	source/paint/detail/image_bmp.hpp
	source/paint/detail/image_ico.hpp

2015-08-01 22:08:06 +08:00

..

image_bmp.hpp

Merge branch 'develop' of https://github.com/beru/nana into beru-develop

2015-08-01 22:08:06 +08:00

image_ico.hpp

Merge branch 'develop' of https://github.com/beru/nana into beru-develop

2015-08-01 22:08:06 +08:00

image_png.hpp

add some missing files, refactor group

2015-07-13 04:57:01 +08:00

image_process_provider.cpp

Breaking changes for expr_color

2014-12-18 13:08:44 +08:00

native_paint_interface.cpp

image::paste throws exception if graphics or image is empty

2015-07-13 00:23:54 +08:00