Merge commit: branch 'work'
authorBrian Norris <banorris@uci.edu>
Mon, 21 May 2012 18:07:44 +0000 (11:07 -0700)
committerBrian Norris <banorris@uci.edu>
Mon, 21 May 2012 18:07:44 +0000 (11:07 -0700)
commit10de861d3a9908e75b6f94283cc67b3f1b4d93ab
treedbf652b4b076efbd15c0a3eed827d435146fbc22
parent9fcdad5ce4e6a253041894fd3e02061474e1af43
parent88aed7f892145f30dc885420b5452b9761e6c2c1
Merge commit: branch 'work'

tree.{cc,h} were replaced with NodeStack. (Will need to update them)

Other trivial conflicts in Makefile and model.h

Conflicts:
Makefile
model.h
tree.cc
tree.h
Makefile
action.h
model.cc
model.h