Merge branch 'dev' of https://github.com/chchwy/pencil2d
Merge branch 'dev'
Merge branch 'master' of https://github.com/chchwy/pencil2d
Merge branch 'dev'
Ignore .xcodeproj
Copyright
[Menu] Fix preference dialog on Mac.
minor
Fix compile warnings
Resolve merge conflict