some minor changes for debugging cursor behaviours and pencil settings
Merge pull request #173 from eVoLuTiVeMEDIA/master

some minor changes for debugging cursor behaviours and pencil settings
A word mismach
Merge branch 'master' of https://github.com/pencil2d/pencil
Resolve compile error after merging
color palette popup [alt][ctrl]
color palette popup code refactor
match group
Merge pull request #176 from chchwy/hotfix/accidentally-clear-shortcuts

Hotfix/accidentally-clear-shortcuts-settings
Merge pull request #175 from eVoLuTiVeMEDIA/master

color palette with popup (code refactor)
limit popup position to drawing area & some shadow effect
finished color palette popup
Resolve merge conflict
Resolve merging conflict
Merge branch 'master' into feature/object-save-loader