summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-01-07 14:10:17 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-01-07 14:10:17 +0100
commite0d5ebf8fd1d508776d63026a9dd336fbb0d648d (patch)
treecf80c8bbd3d669cfe941164955ce04b8a7957637 /vdr.c
parent2e0a3f273a18fd6bcf2bc347a6ca449ac7304016 (diff)
downloadvdr-e0d5ebf8fd1d508776d63026a9dd336fbb0d648d.tar.gz
vdr-e0d5ebf8fd1d508776d63026a9dd336fbb0d648d.tar.bz2
The file 'ca.conf' is obsolete and has been removed; revised all descriptions regarding CICAM
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/vdr.c b/vdr.c
index eb88bc3d..ad0b57dd 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.230 2006/01/06 12:47:16 kls Exp $
+ * $Id: vdr.c 1.231 2006/01/07 12:27:45 kls Exp $
*/
#include <getopt.h>
@@ -514,7 +514,6 @@ int main(int argc, char *argv[])
Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) &&
RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"), true) &&
SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true) &&
- CaDefinitions.Load(AddDirectory(ConfigDirectory, "ca.conf"), true) &&
Keys.Load(AddDirectory(ConfigDirectory, "remote.conf")) &&
KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true)
))