Merge branch 'master' into openpgp

This commit is contained in:
James Booth
2015-06-06 01:03:19 +01:00
4 changed files with 293 additions and 1 deletions

View File

@@ -102,6 +102,7 @@ functionaltest_sources = \
functionaltests/test_rooms.c functionaltests/test_rooms.h \
functionaltests/test_presence.c functionaltests/test_presence.h \
functionaltests/test_message.c functionaltests/test_message.h \
functionaltests/test_chat_session.c functionaltests/test_chat_session.h \
functionaltests/functionaltests.c
main_source = src/main.c