summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2017-01-14 18:26:10 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2017-01-14 18:27:35 -0500
commit5c2508fc75fbc0cf28049f6fcff0e5155517230e (patch)
tree28d29b1aeab3161c7b4ac102c3484c3a74b20d80
parentc8c1b794b51ef20646cb6d30702cb79dee3248ea (diff)
parent00eedbd6178cd92409be08d62b395f92680858ef (diff)
parent0d5b278b76a9ada9060dce10d5a86d6d460f7863 (diff)
parentc959c6b0a235fae077864a494f383285bac0a5b1 (diff)
parent8b45c2af3c6f9654d133bfbb62969367a65d38ad (diff)
parent081f7d3c73c212ddb239c81ce27940771da593f8 (diff)
parent28708b49282ed15ac69df4e16a2d6eccc219fa82 (diff)
parentd98870ac5acfe42d410383dfe7f2af18923510c4 (diff)
Merge remote-tracking branches 'v2/core', 'v2/mod-dist', 'v2/mod-gnu-autoconf', 'v2/mod-gnuconf', 'v2/mod-gnustuff', 'v2/mod-std' and 'v2/mod-write-ifchanged' into v3/master