]> granicus.if.org Git - gc/commitdiff
Merge (dummy) remote-tracking branch 'pcpa/master'
authorIvan Maidanski <ivmai@mail.ru>
Sun, 15 Sep 2013 13:26:14 +0000 (17:26 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Sun, 15 Sep 2013 13:26:14 +0000 (17:26 +0400)
Conflicts:
    include/gc_mark.h
    include/private/gc_priv.h
    mark.c
    os_dep.c


Trivial merge