diff view/ViewManager.cpp @ 1052:834e94eb1bca 3.0-integration

Merge from branch "alignment-simple"
author Chris Cannam
date Thu, 21 Apr 2016 15:06:05 +0100
parents f2c63ec85901
children e0ac21f07ab0
line wrap: on
line diff
--- a/view/ViewManager.cpp	Fri Mar 18 14:25:05 2016 +0000
+++ b/view/ViewManager.cpp	Thu Apr 21 15:06:05 2016 +0100
@@ -741,3 +741,4 @@
     if (pixels != 0 && scaled == 0) scaled = 1;
     return scaled;
 }
+