:q
:q
:q
:q
:q
:q
:q
:q
:w:q
:q
:q
Merge branch 'deadpool' of https://github.com/jgfenix/deadpool into gabriel-view

Conflicts:
	src/examples/an
	src/examples/filemodel_example
	src/examples/inwin_example_01
	src/examples/naviframe_example_01
	src/examples/track_example_01
	src/examples/win_

:q
:q
:wq:q
Merge branch 'deadpool' of https://github.com/jgfenix/deadpool into gabriel-wnd

:q