merge stuff
authorBrian Demsky <bdemsky@uci.edu>
Wed, 19 Sep 2012 23:55:10 +0000 (16:55 -0700)
committerBrian Demsky <bdemsky@uci.edu>
Wed, 19 Sep 2012 23:55:10 +0000 (16:55 -0700)
commit15190694fd79202132be5f6e056fa5c00893664e
tree13084ebcc6e6fea2342bd1a8023f435f57607660
parent85fac9c01a7269fe0a879f97155f9c5976672606
parentbd893aac350f125dc990f0ccd32b8e3cf133e2fb
merge stuff
Merge branch 'master' into mutex

Conflicts:
model.cc
model.h
model.cc