Merge branch 'master' into playable_shots
authorJérôme Benoit <jerome.benoit@piment-noir.org>
Fri, 5 May 2017 18:24:34 +0000 (20:24 +0200)
committerJérôme Benoit <jerome.benoit@piment-noir.org>
Fri, 5 May 2017 18:24:34 +0000 (20:24 +0200)
commit6d7fa659380189a35b8d7cce9f0417b4ed1ce3a5
tree6c9279441c9dc78d8fc5793e036971a397b384bf
parentbbbe0570290fabaa78053bf74b5571ff43b589ae
parentb5cb4c1247e32f76b64166ac0b776de776374631
Merge branch 'master' into playable_shots

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>