Merge branch 'master' into rempt/T6282-replace-add-shape-docker
de2d7bc3270c
Actions

Authored by rempt on Jun 8 2017, 7:31 AM.

Description

Merge branch 'master' into rempt/T6282-replace-add-shape-docker

Committed

rempt

Jun 8 2017, 7:31 AM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
c2b3000ea5b3	rempt	FEATURE: Actions for toggling layer visibility, lock, alpha inherit and alpha…	Jun 8 2017
7099c1567c4d	rempt	Implement shortcuts for layer lock and layer visibility	Jun 8 2017
9bec9bb20d9b	nicholasl	Fix scroll wheel behavior when using Qt 5.7 or later	Jun 6 2017

				Path	Packages
	M			krita/krita.action
	M			libs/ui/input/wintab/qxcbconnection.cpp
	M			libs/ui/input/wintab/qxcbconnection_xi2.h
	M			libs/ui/kis_node_manager.cpp
	M			libs/ui/kis_node_manager.h
	M			plugins/dockers/defaultdockers/kis_layer_box.cpp