diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2009-02-19 20:29:24 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2009-02-19 20:29:24 +0100 |
| commit | d5d59f964996c24019898e0573067b919fa83a6f (patch) | |
| tree | acbdb7d19f9083c77cb67b52b3c204defb623fca /README | |
| parent | 3b53981b41a59c7935e372a56737c14857432bae (diff) | |
| parent | e3343f602dfe288afa1f027563d307d049d95c1e (diff) | |
| download | vdr-plugin-live-d5d59f964996c24019898e0573067b919fa83a6f.tar.gz vdr-plugin-live-d5d59f964996c24019898e0573067b919fa83a6f.tar.bz2 | |
Merge commit 'tadi/master'
Conflicts:
README
setup.cpp
Diffstat (limited to 'README')
| -rw-r--r-- | README | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -164,7 +164,11 @@ SSL Commandline options -c CERT, --cert=CERT path to a custom ssl certificate file (default: $CONFIGDIR/live.pem) -k KEY, --cert=CERT path to a custom ssl certificate key file +<<<<<<< HEAD:README (default: $CONFIGDIR/live-key.pem) +======= + (default: $CONFIGDIR/live-key.pem) +>>>>>>> tadi/master:README Creating a self-signed SSL server certificate |