
Conflicts: include/nana/gui/widgets/progress.hpp source/gui/widgets/date_chooser.cpp source/gui/widgets/progress.cpp source/gui/widgets/treebox.cpp
Conflicts: include/nana/gui/widgets/progress.hpp source/gui/widgets/date_chooser.cpp source/gui/widgets/progress.cpp source/gui/widgets/treebox.cpp