diff options
| author | James Booth <boothj5@gmail.com> | 2014-01-03 17:54:51 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-01-03 17:54:51 +0000 |
| commit | e504c030a6325fc41d7daf667b2158cb31d8773e (patch) | |
| tree | 06004a53e9ed2130972247c793424cca8638562f /src/roster_list.h | |
| parent | 170af88c0dc736087d40d3591c1880d8af17b5e6 (diff) | |
| parent | cd4f4d0b1a29c642384ff6d6fff7bdf3573fa04e (diff) | |
| download | profani-tty-e504c030a6325fc41d7daf667b2158cb31d8773e.tar.gz | |
Merge branch 'master' into otr
Conflicts: configure.ac
Diffstat (limited to 'src/roster_list.h')
0 files changed, 0 insertions, 0 deletions