[hackers] [scc] Merge branch 'master' of ssh://suckless.org/gitrepos/scc || Roberto E. Vargas Caballero

From: <git_AT_suckless.org>
Date: Fri, 24 Jul 2015 17:39:08 +0200 (CEST)

commit b86fdca96b49c9000d32995a427f2ac8fad4ef6a
Merge: 73e8f02 75f20c4
Author: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
AuthorDate: Fri Jul 24 17:27:23 2015 +0200
Commit: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
CommitDate: Fri Jul 24 17:27:23 2015 +0200

    Merge branch 'master' of ssh://suckless.org/gitrepos/scc
    
    Conflicts:
            cc1/cc1.h
Received on Fri Jul 24 2015 - 17:39:08 CEST

This archive was generated by hypermail 2.3.0 : Fri Jul 24 2015 - 17:48:16 CEST