James Booth d339004f55 Merge branch 'master' into chatstates ... Conflicts: Makefile.am		2012-10-30 01:38:08 +00:00
..
test_chat_session.c	Basic chat session states	2012-10-04 00:34:03 +01:00
test_common.c	Merge common and util	2012-08-23 01:08:06 +01:00
test_contact_list.c	Fixed tests	2012-10-29 22:55:17 +00:00
test_prof_autocomplete.c	Fixed tests	2012-10-29 22:55:17 +00:00
test_prof_history.c	Removed trailing whitespace from src and tests	2012-10-21 20:02:20 +01:00
testsuite.c	Started work on chat session, and chat states	2012-10-03 23:47:10 +01:00
testsuite.h	Started work on chat session, and chat states	2012-10-03 23:47:10 +01:00