Merge remote-tracking branch 'upstream/master'
authorTony <exocoder@gmail.com>
Tue, 8 Apr 2014 18:14:05 +0000 (19:14 +0100)
committerTony <exocoder@gmail.com>
Tue, 8 Apr 2014 18:14:05 +0000 (19:14 +0100)
commit3cd50739ef28ce02f02bc56dee8ad1636e33e7ae
treebedc4372cd74215ad82725d4b548e4e67afc7bf7
parent572e4f52556cc833df3a98126acbc8c346db3bd5
parent5600bc54f4e751180f7c9d50b17235bba2f086af
Merge remote-tracking branch 'upstream/master'
CMakeLists.txt
cmake/templates/cvconfig.h.in