Merge branch 'glut-rebased' of git://github.com/fperez/ipython into glut...
Merge branch 'glut-rebased' of git://github.com/fperez/ipython into glut
* 'glut-rebased' of git://github.com/fperez/ipython:
Added the command line option
Fix code in disable_glut which was not tested and quite buggy
Tried to fix the CTRL-C problem (
https://github.com/ipython/ipython/pull/742) and take other comments/typos into account
Replaced deprecated raise call
Fixed typos in comments
Canceled window reshape to 1x1 since the idea is now for the user to use this window as the main one because of weird seg-faults problem after user creates its own window (any subsequent gl error would lead to a segfault, even a simple one line requiring a non existent function
Event loop integration example
Added code for the GLUT interactive session