Merge branch 'master' into usage-exit-code
authorMatt Mitchell <mmitche@microsoft.com>
Wed, 1 Apr 2015 23:07:45 +0000 (16:07 -0700)
committerMatt Mitchell <mmitche@microsoft.com>
Wed, 1 Apr 2015 23:07:45 +0000 (16:07 -0700)
commit08fa669ea1857e5dfbda0fecb7adb85ee7acd1ed
treedf4d6812ca52bc07e75c82750ef95a092ba4e356
parent268f0a413d807a5edacf33a9e5f514c7b19f7104
parent838807429a0828a839958e3b7d392d65886c8f2e
Merge branch 'master' into usage-exit-code

Conflicts:
build.cmd
build.cmd
tests/buildtest.cmd
tests/runtest.cmd