Skip to content

Commit

Permalink
Merge branch 'dragndrop'
Browse files Browse the repository at this point in the history
  • Loading branch information
gfacciol committed Aug 29, 2016
2 parents d39174e + cecb31c commit 898e857
Show file tree
Hide file tree
Showing 464 changed files with 55,858 additions and 64,754 deletions.
5 changes: 3 additions & 2 deletions CREDITS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Everybody gets credit for their contribution.

* Developers
Gabriele Facciolo
Enric Meinhardt (iio library)
Enric Meinhardt (iio.c library)

* Testing, ideas and suggestions
Carlo de Franchis
Expand All @@ -12,11 +12,12 @@ Rafael Grompone Von Gioi

* Libraries, wrappers, blog posts
https://github.com/mnhrdt/iio/
https://github.com/rougier/pyglfw
https://github.com/FlorianRhiem/pyGLFW
htte://www.seethroughskin.com/blog/?p=771
http://python-opengl-examples.blogspot.com.es/
http://www.lighthouse3d.com/tutorials/glsl-core-tutorial/fragment-shader/
http://www.cityinabottle.org/nodebox/shader/
http://stackoverflow.com/questions/4355524/getting-data-from-ctypes-array-into-numpy
http://docs.scipy.org/doc/numpy/reference/generated/numpy.frombuffer.html
https://github.com/rougier/pyglfw (not used anymore)
http://cimg.sourceforge.net/ (not used anymore)
2 changes: 1 addition & 1 deletion glfw/glfw-3.0.4.bin.WIN64/COPYING.txt → glfw/COPYING.txt
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (c) 2002-2006 Marcus Geelnard
Copyright (c) 2006-2010 Camilla Berglund <elmindreda@elmindreda.org>
Copyright (c) 2006-2016 Camilla Berglund <elmindreda@glfw.org>

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Expand Down
Loading

0 comments on commit 898e857

Please sign in to comment.