Browse code Merge branch 'warrenm_osx' docking features/draw_callback_extra_arg features/fnv1a features/imvector_size_t features/premake features/range_select features/tex_round_corners master v1.67-fixes v1.71 v1.70 v1.69 v1.68 v1.67 v1.66b v1.66 v1.65 v1.64 v1.63
commit 839e4d34bd08fff8c61bfce5c88a594afbdc8485 2 parents d11d211 + c3f9220 Omar Cornut authored on 8 Jul 2018

Showing 25 changed files

• CHANGELOG.txt
• README.md
• examples/README.txt
• examples/example_apple/.gitignore
• examples/example_apple_metal/README.md
• examples/example_apple_metal/Shared/AppDelegate.h
• examples/example_apple_metal/Shared/AppDelegate.m
• examples/example_apple_metal/Shared/Renderer.h
• examples/example_apple_metal/Shared/Renderer.mm
• examples/example_apple_metal/Shared/ViewController.h
• examples/example_apple_metal/Shared/ViewController.mm
• examples/example_apple_metal/Shared/main.m
• examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
• examples/example_apple_metal/iOS/Base.lproj/Main.storyboard
• examples/example_apple_metal/iOS/Default-568h@2x.png
• examples/example_apple_metal/iOS/Info-iOS.plist
• examples/example_apple_metal/iOS/Launch Screen.storyboard
• examples/example_apple_metal/macOS/Base.lproj/Main.storyboard
• examples/example_apple_metal/macOS/Info-macOS.plist
• examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj
• examples/example_apple_opengl2/main.mm
• examples/imgui_impl_metal.h
• examples/imgui_impl_metal.mm
• examples/imgui_impl_osx.h
• examples/imgui_impl_osx.mm

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View README.md

Ignore Space Show notes View examples/README.txt

Show notes View examples/example_apple/.gitignore 100644 → 0

Ignore Space Show notes View examples/example_apple_metal/README.md 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/AppDelegate.h 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/AppDelegate.m 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/Renderer.h 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/Renderer.mm 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/ViewController.h 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/ViewController.mm 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/Shared/main.m 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/iOS/Base.lproj/Main.storyboard 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/iOS/Default-568h@2x.png 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/iOS/Info-iOS.plist 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/iOS/Launch Screen.storyboard 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/macOS/Base.lproj/Main.storyboard 0 → 100644

Ignore Space Show notes View examples/example_apple_metal/macOS/Info-macOS.plist 0 → 100644

Ignore Space Show notes View examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj 0 → 100644

Ignore Space Show notes View examples/example_apple_opengl2/main.mm 0 → 100644

Ignore Space Show notes View examples/imgui_impl_metal.h 0 → 100644

Ignore Space Show notes View examples/imgui_impl_metal.mm 0 → 100644

Ignore Space Show notes View examples/imgui_impl_osx.h 0 → 100644

Ignore Space Show notes View examples/imgui_impl_osx.mm 0 → 100644

Show line notes below