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

..

audio

testing and doxy comment audio and screen

2015-05-11 22:53:34 +02:00

detail

fix an explicit conversion error from ifstream to bool

2015-06-25 02:00:57 +08:00

filesystem

mimic path.filename()

2015-05-28 01:46:37 +02:00

gui

Merge branch 'hotfixes-1.0.2' into develop

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

paint

Merge branch 'hotfixes-1.0.2' into develop

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

system

fix some MinGW compiling errors

2015-05-03 17:38:58 +08:00

threads

first init of 0.9

2014-12-11 03:32:35 +08:00

any.cpp

first init of 0.9

2014-12-11 03:32:35 +08:00

basic_types.cpp

update scroll.hpp

2015-04-26 00:50:28 +08:00

charset.cpp

fix a charset issue

2015-06-17 00:07:20 +08:00

datetime.cpp

fix some MinGW compiling errors

2015-05-04 03:42:16 +08:00

deploy.cpp

minor changes

2015-04-10 01:18:32 +08:00

exceptions.cpp

first init of 0.9

2014-12-11 03:32:35 +08:00

internationalization.cpp

code reviews

2015-02-26 02:35:19 +08:00

traits.cpp

first init of 0.9

2014-12-11 03:32:35 +08:00

unicode_bidi.cpp

code reviews

2015-04-12 23:26:27 +08:00