diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2009-09-08 23:08:54 +0200 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2009-09-08 23:08:54 +0200 |
| commit | fd1e4dad6f9ad3d95001b1785be3cfc56931fbe0 (patch) | |
| tree | 481970923c38e41013a4f84d048acd0aba9fa053 /README | |
| parent | 712a9120b4de6fd5fa349ed3e4c61b507553e638 (diff) | |
| parent | 1a19a11081e56aff745ca0ba625187fabc54fb94 (diff) | |
| download | vdr-plugin-live-cvs-commit-366.tar.gz vdr-plugin-live-cvs-commit-366.tar.bz2 | |
Merge commit 'winni/master' into develcvs-commit-366
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 |