parradox/GesturesEditor — pull request #15 by parradox (2012-12-02 10:39:35+00:00)
Title: Air van21 master

new method of solving conflicts