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

Merge branch 'master' into otr

Browse Source 
Conflicts:
	Makefile.am
This commit is contained in:
James Booth
2014-01-02 01:57:05 +00:00
parent bc700fbfea 3fbd45bd06
commit 170af88c0d
36 changed files with 2646 additions and 1593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@@ -62,15 +62,16 @@ test_sources = \
src/config/preferences.c src/config/preferences.h \
src/config/theme.c src/config/theme.h \
src/otr.c src/otr.h \
tests/ui/mock_ui.c \
tests/xmpp/mock_xmpp.c \
tests/xmpp/mock_xmpp.h tests/xmpp/mock_xmpp.c \
tests/ui/mock_ui.h tests/ui/mock_ui.c \
tests/config/mock_accounts.h tests/config/mock_accounts.c \
tests/log/mock_log.c \
tests/config/mock_accounts.c \
tests/test_autocomplete.c \
tests/test_common.c \
tests/test_cmd_connect.c \
tests/test_cmd_account.c \
tests/test_cmd_rooms.c \
tests/test_cmd_sub.c \
tests/test_history.c \
tests/test_jid.c \
tests/test_parser.c \