devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-25 07:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into otr

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
James Booth
2014-01-05 01:20:42 +00:00
parent e504c030a6 5898da963a
commit f569845b40
7 changed files with 498 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -68,6 +68,7 @@ test_sources = \
tests/log/mock_log.c \
tests/test_autocomplete.c \
tests/test_common.c \
tests/test_contact.c \
tests/test_cmd_connect.c \
tests/test_cmd_account.c \
tests/test_cmd_rooms.c \