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

Merge branch 'master' into pgp

Browse Source
This commit is contained in:
James Booth
2015-04-19 16:56:11 +01:00
parent bcfbbac49a 424f52c3fa
commit 60f94722d4
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@@ -13,7 +13,7 @@ core_sources = \
src/xmpp/roster.c src/xmpp/roster.h \
src/xmpp/bookmark.c src/xmpp/bookmark.h \
src/xmpp/form.c src/xmpp/form.h \
src/server_events.c src/server_events.h \
src/event/server_events.c src/event/server_events.h \
src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/core.c \
src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \
src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \
@@ -61,7 +61,7 @@ tests_sources = \
src/ui/buffer.c \
src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \
src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \
src/server_events.c src/server_events.h \
src/event/server_events.c src/event/server_events.h \
tests/xmpp/stub_xmpp.c \
tests/ui/stub_ui.c \
tests/pgp/stub_gpg.c \