omar 4a43f347bb Merge branch 'viewport' into docking ... # Conflicts: # examples/example_allegro5/main.cpp # examples/example_marmalade/main.cpp		2018-11-15 14:00:01 +01:00
..
build_win32.bat
example_win32_directx9.vcxproj
example_win32_directx9.vcxproj.filters
main.cpp