diff options
| author | Anton <anton@picapica> | 2017-12-01 21:55:53 +0400 |
|---|---|---|
| committer | Anton <anton@picapica> | 2017-12-01 21:55:53 +0400 |
| commit | ac041927bc0c82e33acaa9e15fd46ecca0b77172 (patch) | |
| tree | 742f1bf43917e79dae43c78684a2a3d055214e76 /Makefile.am | |
| parent | 32e742ed040c5a70edb4cbfb947581f1e192d5a6 (diff) | |
| parent | 9c0a5bf2bbd94539427ece7eb1cb8ea82c6c3dec (diff) | |
| download | pica-pica-ac041927bc0c82e33acaa9e15fd46ecca0b77172.tar.gz pica-pica-ac041927bc0c82e33acaa9e15fd46ecca0b77172.zip | |
Merge branch 'direct_c2c_connections'
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 5ec82f5..bb19dac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,8 +71,6 @@ pica-client/msguirouter.cpp \ pica-client/msguirouter.h \ pica-client/nodes.cpp \ pica-client/nodes.h \ -pica-client/nodethread.cpp \ -pica-client/nodethread.h \ pica-client/openssltool.cpp \ pica-client/openssltool.h \ pica-client/picaactioncenter.cpp \ @@ -90,6 +88,8 @@ pica-client/filetransfercontroller.cpp \ pica-client/filetransfercontroller.h \ pica-client/sound.cpp \ pica-client/sound.h \ +pica-client/settings.cpp \ +pica-client/settings.h \ \ pica-client/dialogs/addaccountdialog.cpp \ pica-client/dialogs/addaccountdialog.h \ @@ -103,6 +103,8 @@ pica-client/dialogs/showpicaiddialog.cpp \ pica-client/dialogs/showpicaiddialog.h \ pica-client/dialogs/filetransferdialog.cpp \ pica-client/dialogs/filetransferdialog.h \ +pica-client/dialogs/settingsdialog.cpp \ +pica-client/dialogs/settingsdialog.h \ PICA_client.c \ PICA_client.h \ PICA_msgproc.c \ @@ -119,12 +121,12 @@ moc_contactlistwidget.cpp \ moc_forgedcertdialog.cpp \ moc_mainwindow.cpp \ moc_msguirouter.cpp \ -moc_nodethread.cpp \ moc_picaactioncenter.cpp \ moc_picasystray.cpp \ moc_registeraccountdialog.cpp \ moc_filetransferdialog.cpp \ moc_skynet.cpp \ +moc_settingsdialog.cpp \ moc_viewcertdialog.cpp \ moc_showpicaiddialog.cpp \ moc_dhparam.cpp \ |