summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2012-03-01 17:07:08 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2012-03-01 17:07:08 +0000
commit0a7c66f48e2a4f5f1b80237def4063fa952ccc71 (patch)
tree0bcd63e3be735ffce94cf7283c8a41b78867ac6b /data
parent52fac3507be8db06a9e1ae1b7a3c98a28d02da44 (diff)
parentc8f08ceb6e7f44303d1950a565e47f170129e524 (diff)
Merge branch 'detp-jingle'
https://bugs.freedesktop.org/show_bug.cgi?id=46513 Conflicts: src/ft-channel.c
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions