Merge branch 'master' into pgp

This commit is contained in:
James Booth
2015-04-30 22:10:03 +01:00
10 changed files with 81 additions and 158 deletions

View File

@@ -82,7 +82,6 @@ tests_sources = \
tests/test_cmd_roster.c tests/test_cmd_roster.h \
tests/test_cmd_statuses.c tests/test_cmd_statuses.h \
tests/test_cmd_sub.c tests/test_cmd_sub.h \
tests/test_cmd_win.c tests/test_cmd_win.h \
tests/test_cmd_disconnect.c tests/test_cmd_disconnect.h \
tests/test_common.c tests/test_common.h \
tests/test_contact.c tests/test_contact.h \