aaa
Update LayerManager.cpp
Update StampBrush.h
Update StampBrush.h
Update StampBrush.h
Update StampBrush.cpp
Update StampBrush.h
Update StampBrush.cpp
Update BrushPropertiesWidget.h
Update BrushPropertiesWidget.cpp
Update StampBrush.h
Update StampBrush.cpp
Update StampBrush.h
Update TileSelectorScene.h
Update TileSelectorScene.cpp
Badly named variable
Merge branch 'master' into StampBrush
small change
merge resolve
merge