
Conflicts: include/nana/detail/linux_X11/platform_spec.hpp source/detail/linux_X11/platform_spec.cpp source/paint/detail/native_paint_interface.cpp
Conflicts: include/nana/detail/linux_X11/platform_spec.hpp source/detail/linux_X11/platform_spec.cpp source/paint/detail/native_paint_interface.cpp