Merge remote-tracking branch 'origin/1.0.x'
authorKshitij Bansal <kshitij@cs.nyu.edu>
Tue, 5 Feb 2013 21:24:02 +0000 (16:24 -0500)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Tue, 5 Feb 2013 21:24:02 +0000 (16:24 -0500)
commit2704a810d79b0c47b634fd06032da6490b82db71
tree40035782b3b1482250d6c65313b394cae769ffe7
parentf910148c846556877508c684981f0aa9a88671c5
parentb96d64bf23a53bd630bd822ff534517157ee08fd
Merge remote-tracking branch 'origin/1.0.x'
src/decision/justification_heuristic.h