summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorGustavo Pichorim Boiko <gustavo.boiko@collabora.co.uk>2011-05-26 13:54:41 -0700
committerGustavo Pichorim Boiko <gustavo.boiko@collabora.co.uk>2011-05-26 13:54:49 -0700
commit6e1dbaf036f96b55fe6041e074372005a1cfe185 (patch)
tree6303b661f3ccbdb708b623fd851b1c4cf6b08e4f /CMakeLists.txt
parentbb2c09fdc563f7ce3212d7c011a7a067467bb3ce (diff)
parent49f3d059f8bbf3f196526545b05b4eb47afda6ec (diff)
Merge remote branch 'asoliver/contactlist'
Reviewed by: Gustavo Pichorim Boiko <gustavo.boiko@collabora.co.uk>
Diffstat (limited to 'CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions