diff options
| author | Marius Halden <marius.h@lden.org> | 2016-07-06 21:04:39 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-07-06 21:04:39 +0200 |
| commit | 2f2fb6dda408ad2562cc754e2ca0ad3c2ea8bc8e (patch) | |
| tree | 8fb3727ea51728ea0ee4c075f53ce93b1ef12161 /protocols/purple/purple.c | |
| parent | fd86ad18b56b77321d3e235594b6ae7e4f7acabd (diff) | |
| parent | 7e41de51bd6466306f21e1d2bf54b3251c1bf08e (diff) | |
Merge branch 'scram' into patched-master
Diffstat (limited to 'protocols/purple/purple.c')
0 files changed, 0 insertions, 0 deletions