Merge pull request #2370 from gdh1995/master
authorJon Long <jonlong@cs.berkeley.edu>
Sun, 26 Apr 2015 22:02:26 +0000 (15:02 -0700)
committerJon Long <jonlong@cs.berkeley.edu>
Sun, 26 Apr 2015 22:02:26 +0000 (15:02 -0700)
commit69f32ba741f7f35988f8b56a6dfe22006ec3c98d
treea2526ed9b58607228eaeb246f883b237977984df
parenta382e19d9548d820b5d68e1fd6f50f3604c1222e
parent23685324b94ef1248ad5b377121f4e71cda24293
Merge pull request #2370 from gdh1995/master

move CPU_ONLY to right place