Merge branch 'master' into experimental - sam - An updated version of the sam text editor.
 (HTM) git clone git://vernunftzentrum.de/sam.git
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) LICENSE
       ---
 (DIR) commit 95aaede4077adc412cb209795e1ea4706395b345
 (DIR) parent 955ee1874719635a97ec0ac1fc3ad6c6f275f7e7
 (HTM) Author: Rob King <jking@deadpixi.com>
       Date:   Wed,  7 Dec 2016 10:00:51 -0600
       
       Merge branch 'master' into experimental
       
       Diffstat:
         samterm/samrc.c                     |       1 +
       
       1 file changed, 1 insertion(+), 0 deletions(-)
       ---
 (DIR) diff --git a/samterm/samrc.c b/samterm/samrc.c
       @@ -76,6 +76,7 @@ static Namemapping buttonmapping[] ={
        static Namemapping modmapping[] ={
            {"*", 0},
            {"c", ControlMask}, 
       +    {"a", Mod1Mask},
            {"s", ShiftMask},
            {NULL, 0}
        };