devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into chatstates

Browse Source 
Conflicts:
	Makefile.am
This commit is contained in:
James Booth
2012-10-30 01:38:08 +00:00
parent 9f266ac000 768b2aa466
commit d339004f55
16 changed files with 507 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -14,7 +14,7 @@ check_PROGRAMS = tests/testsuite
tests_testsuite_SOURCES = tests/test_contact_list.c src/contact_list.c src/contact.c \
tests/test_common.c tests/test_prof_history.c src/prof_history.c src/common.c \
tests/test_prof_autocomplete.c src/prof_autocomplete.c tests/testsuite.c \
tests/test_chat_session.c src/chat_session.c
tests/test_chat_session.c src/chat_session.c src/log.c
tests_testsuite_LDADD = -lheadunit -lstdc++
man_MANS = docs/profanity.1