Merge remote-tracking branch 'tikhomirov/osx_joystick'

Conflicts:
	.gitignore
	src/cocoa_init.m

.gitignore

@@ -3,16 +3,20 @@ cmake_install.cmake
 CMakeCache.txt
 Makefile
 cmake_uninstall.cmake
+.DS_Store
 src/config.h
 src/libglfw.pc
 src/libglfw.so
 src/libglfw.a
+src/libglfw.dylib
 examples/boing
 examples/gears
 examples/heightmap
 examples/splitview
 examples/triangle
 examples/wave
+examples/*.app
+examples/*.exe
 tests/accuracy
 tests/defaults
 tests/dynamic
@@ -29,3 +33,5 @@ tests/reopen
 tests/sharing
 tests/tearing
 tests/windows
+tests/*.app
+tests/*.exe