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 25fd316e306a2e8b63d5439fe4f5031e5e3dc49c
 (DIR) parent 12c6d12c65eef2dc2393d5a918731113ca15bc00
 (HTM) Author: Rob King <jking@deadpixi.com>
       Date:   Wed, 19 Oct 2016 10:00:36 -0500
       
       Merge branch 'master' into experimental
       
       Diffstat:
         rsam/Makefile                       |       1 +
       
       1 file changed, 1 insertion(+), 0 deletions(-)
       ---
 (DIR) diff --git a/rsam/Makefile b/rsam/Makefile
       @@ -7,6 +7,7 @@ include ../config.mk
        all: rsam
        
        rsam: rsam.o
       +        $(CC) -o rsam rsam.o $(LDFLAGS)
        
        clean:
                rm -f *.o rsam