summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-09 15:51:43 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-09 15:51:43 -0400
commit2dd69d787b7040061645c8d6518d319d356eca53 (patch)
tree7d7f076e243f304b37fcfdb34138e9ce3b474641
parent7132ae3d2ba7d1aa3a1639c41248c674a7a941ae (diff)
parent00eedbd6178cd92409be08d62b395f92680858ef (diff)
parentd331934d1fcdaea5474a1da3605907447f7ef6ee (diff)
parent0d5b278b76a9ada9060dce10d5a86d6d460f7863 (diff)
Merge remote-tracking branches 'autothing/core', 'autothing/mod-std' and 'autothing/mod-dist'