5a95ba Merge branch 'master' of git://github.com/m-grimaud/opentoonz into m-grimaud-master

Merged and Committed by Shinya Kitaoka 9 years ago
    Merge branch 'master' of git://github.com/m-grimaud/opentoonz into m-grimaud-master
    
    # Conflicts:
    #	README.md
    
        
file modified
+31 -0
file added
+124