Konstantin Käfer 4ad3a1ee76 Merge branch 'master' into blur ...

Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp

2014-05-26 17:30:31 +02:00

..

curl_request.cpp

move to libuv for the rendering loop

2014-04-30 12:01:26 +02:00

foundation_request.h

we no longer use this notification

2014-05-01 11:26:59 -07:00

foundation_request.mm

increase http timeout

2014-05-26 10:59:15 +02:00

glfw_view.cpp

foundations of delegate/callback API

2014-05-23 18:32:55 -07:00

glfw_view.hpp

remove concept of settings object from library

2014-04-30 13:47:03 +02:00

settings_json.cpp

remove concept of settings object from library

2014-04-30 13:47:03 +02:00

settings_json.hpp

remove concept of settings object from library

2014-04-30 13:47:03 +02:00

settings_nsuserdefaults.hpp

remove concept of settings object from library

2014-04-30 13:47:03 +02:00

settings_nsuserdefaults.mm

remove concept of settings object from library

2014-04-30 13:47:03 +02:00