GitHub PushEvent at 2014-06-04 14:33:59
Repository: psychopy
Actor: peircej
Payload: {"shas":[["d62f7a0776a4fe069eeed813b592fe2bf886686c","eae6eaed4a1a667da1d2a361303cc78f8071dfd8@gmail.com","FF: problems with bufferimagestim caused by previous merge conflict\n\nThe new attribute setters of Jonas had been partially copied over but not\nfully. I decided to move them wholesale","Jon Peirce",true],["50d100e0e4df4adb22fb43ed19be08f584ebe252","eae6eaed4a1a667da1d2a361303cc78f8071dfd8@gmail.com","BF: Better handling of machines for don't support FBO methods\n\nConflicts:\n\n\tpsychopy/visual/window.py","Jon Peirce",true],["640fd63204b2901339d3367d0e86bd02a77444a5","eae6eaed4a1a667da1d2a361303cc78f8071dfd8@gmail.com","DOCS: updated changelog","Jon Peirce",true],["d1872786036acb26ed01884cbb7477f0c6759c51","eae6eaed4a1a667da1d2a361303cc78f8071dfd8@gmail.com","DOCS: bumped version number for release 1.80.05","Jon Peirce",true]],"size":4,"ref":"refs/heads/r1.80","head":"d1872786036acb26ed01884cbb7477f0c6759c51"}