diff options
| author | James Booth <boothj5@gmail.com> | 2015-02-10 20:47:22 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-02-10 20:47:22 +0000 |
| commit | 13297a151f0612516bcff643ff618bb28b64ddf1 (patch) | |
| tree | b49e2334c29f71b48c88d70cc85ebc51c49ec63d /src/xmpp | |
| parent | 64774a947edf87f6acae07305861149f5194052b (diff) | |
| parent | 6ab937c3e37b71315ab8661c6188ded49dfa182b (diff) | |
| download | profani-tty-13297a151f0612516bcff643ff618bb28b64ddf1.tar.gz | |
Merge branch 'master' into readline
Conflicts: src/ui/inputwin.c
Diffstat (limited to 'src/xmpp')
0 files changed, 0 insertions, 0 deletions