|
0d7e779b37
|
Merge branch 'master' into osx
# Conflicts:
# examples/.gitignore
# examples/README.txt
|
2018-07-04 13:13:11 +02:00 |
|
|
42a919f303
|
Examples: Apple: Fixed paths of GLFW+GL2 example. (#1906) Update ignore list.
|
2018-06-27 09:39:52 +02:00 |
|
|
fac0c801da
|
Examples: Added imgui_impl_osx.mm bindings (#1870, #281)
|
2018-06-11 10:19:17 +02:00 |
|
|
6f7b7807ad
|
Fixed Travis path + various paths in comments/documentations
|
2018-06-10 16:14:43 +02:00 |
|
|
8d58fbb5ed
|
Examples: Renamed example folders. (#1870)
|
2018-06-10 15:42:14 +02:00 |
|