Merge branch 'pt/non-mouse-usage' into pu
authorPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 3 Oct 2016 22:30:44 +0000 (23:30 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 3 Oct 2016 22:30:44 +0000 (23:30 +0100)
1  2 
git-gui.sh
diff --cc git-gui.sh
Simple merge