summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorGustavo Pichorim Boiko <gustavo.boiko@collabora.co.uk>2011-06-06 11:25:34 -0700
committerGustavo Pichorim Boiko <gustavo.boiko@collabora.co.uk>2011-06-06 11:25:38 -0700
commitdfe91afc44e55816947b81deb665da06987067b7 (patch)
treebcc16eabb06749709de3e17374cfbf8552a4c44d /CMakeLists.txt
parent922bc1c1fd57c841fc7293673f776ab49638914e (diff)
parent304fa1fc556baebc4adf603f55065ca084696fa9 (diff)
Merge remote branch 'asoliver/status'
Reviewed-by: Gustavo Pichorim Boiko <gustavo.boiko@collabora.co.uk>
Diffstat (limited to 'CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions