Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit 1cd391146d60fa7cec6dee79c364efc1d745ad52
2 parents 67d9315 + 5f039e7
@ocornut ocornut authored on 7 Jul 2015
Showing 26 changed files
View
examples/README.txt
View
examples/ios_example/.gitignore 0 → 100644
View
examples/ios_example/README.md 0 → 100644
View
examples/ios_example/imguiex.xcodeproj/project.pbxproj 0 → 100644
View
examples/ios_example/imguiex/AppDelegate.h 0 → 100644
View
examples/ios_example/imguiex/AppDelegate.m 0 → 100644
View
examples/ios_example/imguiex/Base.lproj/LaunchScreen.xib 0 → 100644
View
examples/ios_example/imguiex/Base.lproj/Main.storyboard 0 → 100644
View
examples/ios_example/imguiex/GameViewController.h 0 → 100644
View
examples/ios_example/imguiex/GameViewController.m 0 → 100644
View
examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/Contents.json 0 → 100644
View
examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_60@2x~iphone.png 0 → 100644
View
examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_60@3x~iphone.png 0 → 100644
View
examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_76@2x~ipad.png 0 → 100644
View
examples/ios_example/imguiex/Images.xcassets/AppIcon.appiconset/icon_imgui_76~ipad.png 0 → 100644
View
examples/ios_example/imguiex/Info.plist 0 → 100644
View
examples/ios_example/imguiex/Shaders/Shader.fsh 0 → 100644
View
examples/ios_example/imguiex/Shaders/Shader.vsh 0 → 100644
View
examples/ios_example/imguiex/debug_hud.cpp 0 → 100644
View
examples/ios_example/imguiex/debug_hud.h 0 → 100644
View
examples/ios_example/imguiex/imgui_ex_icon.png 0 → 100644
View
examples/ios_example/imguiex/imgui_impl_ios.h 0 → 100644
View
examples/ios_example/imguiex/imgui_impl_ios.mm 0 → 100644
View
examples/ios_example/imguiex/main.m 0 → 100644
View
examples/libs/usynergy/uSynergy.c 0 → 100644
View
examples/libs/usynergy/uSynergy.h 0 → 100644