summaryrefslogtreecommitdiff
path: root/priv
diff options
context:
space:
mode:
authorTristan Sloughter <tristan.sloughter@gmail.com>2015-02-22 18:23:15 -0600
committerTristan Sloughter <tristan.sloughter@gmail.com>2015-02-22 18:23:15 -0600
commit4b9adefcb844111607891c9d7071794764126fc7 (patch)
treed6073996ad624ec97ee34179fb19c27a6292cee6 /priv
parent558646adbc044d85aae4d972682d008a9c7554c7 (diff)
parent04235f1a63ebfec1b6fbd1b6c5ed9b6a2853b8a8 (diff)
Merge pull request #173 from talentdeficit/empty_locks_fix
don't attempt to merge locks when there are no dependencies
Diffstat (limited to 'priv')
0 files changed, 0 insertions, 0 deletions