{"shas":[["cbfb91a5f322428068b8ed10a7f4372bb4ba3129","44f878afe53efc66b76772bd845eb65944ed8232@peirce.org.uk","Merge branch 'master' of https://github.com/jeremygray/psychopy\n\n* 'master' of https://github.com/jeremygray/psychopy:\n  minor formatting in Dlg.addField()\n  minor rating scale: display choices even if only two\n  ratingscale: minor tweak of marker position\n  ratingscale: revert merge conflict\n  bugfix: RatingScale precision=1 plus autoRescale was off by 10x\n  RatingScale minor enhancements\n  enhance RatingScale: single-click, custom marker, triangle (new on windows)","Jon Peirce"]],"ref":"refs/heads/master","size":1,"head":"cbfb91a5f322428068b8ed10a7f4372bb4ba3129","push_id":35163689}