Merge pull request #18 from timothy-king/master
authorTim King <taking@cs.nyu.edu>
Sat, 8 Mar 2014 19:44:56 +0000 (14:44 -0500)
committerTim King <taking@cs.nyu.edu>
Sat, 8 Mar 2014 19:44:56 +0000 (14:44 -0500)
commitbbb8637c877a312759547d6159be38866f47eb21
tree86b217cb1889d8d6ad5411f7f4e02994d4e3bef1
parentd01269e2d5a02952fbda74dcd9629acfbf23dfd4
parent0f47a28a18bb9a599514e199d355b8e793cf06de
Merge pull request #18 from timothy-king/master

Merging in the glpk changes