Jinhao b1ed1f0452 Merge branch 'hotfixes-1.0.2' into develop ...

Conflicts:
	include/nana/gui/detail/basic_window.hpp
	include/nana/gui/widgets/listbox.hpp
	source/gui/detail/linux_X11/bedrock.cpp
	source/gui/detail/win32/bedrock.cpp
	source/gui/detail/window_layout.cpp
	source/gui/detail/window_manager.cpp
	source/gui/widgets/listbox.cpp
	source/gui/widgets/toolbar.cpp

2015-07-11 13:35:22 +08:00

..

bedrock.cpp

Merge branch 'hotfixes-1.0.2' into develop

2015-07-11 13:35:22 +08:00