diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-02-01 13:40:56 -0500 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-02-01 13:41:15 -0500 |
| commit | bf805ba0b2ecced81e5c2830a79d021a42da91a7 (patch) | |
| tree | 10046273dae8333e0855041e05dadfe848122460 /plugins/Makefile.am | |
| parent | 1296a2f5ce46e77787ca42eadb1c2ca4a957a09b (diff) | |
| parent | 026e84f10bbfa52f813d30d95b0efbd2ec7a5228 (diff) | |
Merge remote-tracking branch 'siraj/plugin-api-change'
Conflicts:
lib/loudmouth/Makefile.am
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'plugins/Makefile.am')
0 files changed, 0 insertions, 0 deletions