Merge branch 'master' of github.com:Yangqing/caffeine
authorYangqing Jia <jiayq84@gmail.com>
Wed, 18 Sep 2013 20:53:14 +0000 (13:53 -0700)
committerYangqing Jia <jiayq84@gmail.com>
Wed, 18 Sep 2013 20:53:14 +0000 (13:53 -0700)
commit9cc6ed33013cabb9e8c0dc4380e294ed1a0356f4
tree218f8ed32cae4f034486ff835af3a244f5814260
parent5b47cef61cffc78ce5f84782d369e6dc26bb44d5
parent241c300ab7959c5d6e7bc1b86053d5a5310f519d
Merge branch 'master' of github.com:Yangqing/caffeine

Conflicts:
src/caffeine/layers/inner_product_layer.cu
src/caffeine/layers/inner_product_layer.cu