You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
omar 4ff23d3306 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	imgui.cpp
#	imgui.h
7 years ago
..
data Merge branch 'master' of https://github.com/ocornut/imgui 9 years ago
main.cpp Merge branch 'master' into viewport 7 years ago
marmalade_example.mkb Examples: Allegro5, Marmalade: Moved bindings to parent folder. Renamed Allegro stuff from *A5_ to *Allegro5_ 7 years ago