summaryrefslogtreecommitdiff
path: root/libmissioncontrol
diff options
context:
space:
mode:
authorAlberto Mardegan <alberto.mardegan@nokia.com>2009-02-26 14:49:17 +0200
committerAlberto Mardegan <alberto.mardegan@nokia.com>2009-02-26 14:49:17 +0200
commit479af6c535b9b0740857a576e8370339d9575be0 (patch)
tree50b3209127b230a73bb42ffbd1c0a616e768a4f9 /libmissioncontrol
parent59b6dc485c75626af1d8fbd6ed16b4af5cd390e8 (diff)
parentf61a872d715b4665eec3346eae62c799d9b1e3c4 (diff)
Merge branch 'debug'5.0.beta60
Conflicts: src/mcd-manager.c
Diffstat (limited to 'libmissioncontrol')
0 files changed, 0 insertions, 0 deletions