Merge branch 'spi-new' of github.com:tingleby/maa into tingleby-spi-new
authorBrendan Le Foll <brendan.le.foll@intel.com>
Wed, 30 Apr 2014 13:53:21 +0000 (14:53 +0100)
committerBrendan Le Foll <brendan.le.foll@intel.com>
Wed, 30 Apr 2014 13:53:21 +0000 (14:53 +0100)
commit661f7b29ecc7da68a1958d2bb3e9591a421361f7
treeb3c2d3d642f01aa52e7473fa8518d19e458fea77
parent3f0c17eb735b9d6ce7dff25ef31c1e8c01b22a39
parente04d776c9504f725325b7d16d8b49fc6f6523ba8
Merge branch 'spi-new' of github.com:tingleby/maa into tingleby-spi-new

Conflicts:
src/CMakeLists.txt
src/CMakeLists.txt