735 changed files with 31626 additions and 814 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/.gitmodules
+++ b/.gitmodules
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/CODING.RULES.txt
+++ b/CODING.RULES.txt
--- a/0
+++ b/0
--- a/Distribution/doc/example/oscam.ac
+++ b/Distribution/doc/example/oscam.ac
--- a/Distribution/doc/example/oscam.cacheex
+++ b/Distribution/doc/example/oscam.cacheex
--- a/Distribution/doc/example/oscam.cert
+++ b/Distribution/doc/example/oscam.cert
--- a/Distribution/doc/example/oscam.conf
+++ b/Distribution/doc/example/oscam.conf
--- a/Distribution/doc/example/oscam.dvbapi
+++ b/Distribution/doc/example/oscam.dvbapi
--- a/Distribution/doc/example/oscam.guess
+++ b/Distribution/doc/example/oscam.guess
--- a/Distribution/doc/example/oscam.ird
+++ b/Distribution/doc/example/oscam.ird
--- a/Distribution/doc/example/oscam.provid
+++ b/Distribution/doc/example/oscam.provid
--- a/Distribution/doc/example/oscam.server
+++ b/Distribution/doc/example/oscam.server
--- a/Distribution/doc/example/oscam.services
+++ b/Distribution/doc/example/oscam.services
--- a/Distribution/doc/example/oscam.srvid
+++ b/Distribution/doc/example/oscam.srvid
--- a/Distribution/doc/example/oscam.tiers
+++ b/Distribution/doc/example/oscam.tiers
--- a/Distribution/doc/example/oscam.user
+++ b/Distribution/doc/example/oscam.user
--- a/Distribution/doc/example/oscam.whitelist
+++ b/Distribution/doc/example/oscam.whitelist
--- a/Distribution/doc/html/list_smargo.1.html
+++ b/Distribution/doc/html/list_smargo.1.html
--- a/Distribution/doc/html/oscam.1.html
+++ b/Distribution/doc/html/oscam.1.html
--- a/Distribution/doc/html/oscam.ac.5.html
+++ b/Distribution/doc/html/oscam.ac.5.html
--- a/Distribution/doc/html/oscam.cacheex.5.html
+++ b/Distribution/doc/html/oscam.cacheex.5.html
--- a/Distribution/doc/html/oscam.cert.5.html
+++ b/Distribution/doc/html/oscam.cert.5.html
--- a/Distribution/doc/html/oscam.conf.5.html
+++ b/Distribution/doc/html/oscam.conf.5.html
--- a/Distribution/doc/html/oscam.dvbapi.5.html
+++ b/Distribution/doc/html/oscam.dvbapi.5.html
--- a/Distribution/doc/html/oscam.guess.5.html
+++ b/Distribution/doc/html/oscam.guess.5.html
--- a/Distribution/doc/html/oscam.ird.5.html
+++ b/Distribution/doc/html/oscam.ird.5.html
--- a/Distribution/doc/html/oscam.provid.5.html
+++ b/Distribution/doc/html/oscam.provid.5.html
--- a/Distribution/doc/html/oscam.ratelimit.5.html
+++ b/Distribution/doc/html/oscam.ratelimit.5.html
--- a/Distribution/doc/html/oscam.server.5.html
+++ b/Distribution/doc/html/oscam.server.5.html
--- a/Distribution/doc/html/oscam.services.5.html
+++ b/Distribution/doc/html/oscam.services.5.html
--- a/Distribution/doc/html/oscam.srvid.5.html
+++ b/Distribution/doc/html/oscam.srvid.5.html
--- a/Distribution/doc/html/oscam.srvid2.5.html
+++ b/Distribution/doc/html/oscam.srvid2.5.html
--- a/Distribution/doc/html/oscam.tiers.5.html
+++ b/Distribution/doc/html/oscam.tiers.5.html
--- a/Distribution/doc/html/oscam.user.5.html
+++ b/Distribution/doc/html/oscam.user.5.html
--- a/Distribution/doc/html/oscam.whitelist.5.html
+++ b/Distribution/doc/html/oscam.whitelist.5.html
--- a/Distribution/doc/man/list_smargo.1
+++ b/Distribution/doc/man/list_smargo.1
--- a/Distribution/doc/man/oscam.1
+++ b/Distribution/doc/man/oscam.1
--- a/Distribution/doc/man/oscam.ac.5
+++ b/Distribution/doc/man/oscam.ac.5
--- a/Distribution/doc/man/oscam.cacheex.5
+++ b/Distribution/doc/man/oscam.cacheex.5
--- a/Distribution/doc/man/oscam.cert.5
+++ b/Distribution/doc/man/oscam.cert.5
--- a/Distribution/doc/man/oscam.conf.5
+++ b/Distribution/doc/man/oscam.conf.5
--- a/Distribution/doc/man/oscam.dvbapi.5
+++ b/Distribution/doc/man/oscam.dvbapi.5
--- a/Distribution/doc/man/oscam.guess.5
+++ b/Distribution/doc/man/oscam.guess.5
--- a/Distribution/doc/man/oscam.ird.5
+++ b/Distribution/doc/man/oscam.ird.5
--- a/Distribution/doc/man/oscam.provid.5
+++ b/Distribution/doc/man/oscam.provid.5
--- a/Distribution/doc/man/oscam.ratelimit.5
+++ b/Distribution/doc/man/oscam.ratelimit.5
--- a/Distribution/doc/man/oscam.server.5
+++ b/Distribution/doc/man/oscam.server.5
--- a/Distribution/doc/man/oscam.services.5
+++ b/Distribution/doc/man/oscam.services.5
--- a/Distribution/doc/man/oscam.srvid.5
+++ b/Distribution/doc/man/oscam.srvid.5
--- a/Distribution/doc/man/oscam.srvid2.5
+++ b/Distribution/doc/man/oscam.srvid2.5
--- a/Distribution/doc/man/oscam.tiers.5
+++ b/Distribution/doc/man/oscam.tiers.5
--- a/Distribution/doc/man/oscam.user.5
+++ b/Distribution/doc/man/oscam.user.5
--- a/Distribution/doc/man/oscam.whitelist.5
+++ b/Distribution/doc/man/oscam.whitelist.5
--- a/Distribution/doc/txt/list_smargo.txt
+++ b/Distribution/doc/txt/list_smargo.txt
--- a/Distribution/doc/txt/oscam.ac.txt
+++ b/Distribution/doc/txt/oscam.ac.txt
--- a/Distribution/doc/txt/oscam.cacheex.txt
+++ b/Distribution/doc/txt/oscam.cacheex.txt
--- a/Distribution/doc/txt/oscam.cert.txt
+++ b/Distribution/doc/txt/oscam.cert.txt
--- a/Distribution/doc/txt/oscam.conf.txt
+++ b/Distribution/doc/txt/oscam.conf.txt
--- a/Distribution/doc/txt/oscam.dvbapi.txt
+++ b/Distribution/doc/txt/oscam.dvbapi.txt
--- a/Distribution/doc/txt/oscam.guess.txt
+++ b/Distribution/doc/txt/oscam.guess.txt
--- a/Distribution/doc/txt/oscam.ird.txt
+++ b/Distribution/doc/txt/oscam.ird.txt
--- a/Distribution/doc/txt/oscam.provid.txt
+++ b/Distribution/doc/txt/oscam.provid.txt
--- a/Distribution/doc/txt/oscam.ratelimit.txt
+++ b/Distribution/doc/txt/oscam.ratelimit.txt
--- a/Distribution/doc/txt/oscam.server.txt
+++ b/Distribution/doc/txt/oscam.server.txt
--- a/Distribution/doc/txt/oscam.services.txt
+++ b/Distribution/doc/txt/oscam.services.txt
--- a/Distribution/doc/txt/oscam.srvid.txt
+++ b/Distribution/doc/txt/oscam.srvid.txt
--- a/Distribution/doc/txt/oscam.srvid2.txt
+++ b/Distribution/doc/txt/oscam.srvid2.txt
--- a/Distribution/doc/txt/oscam.tiers.txt
+++ b/Distribution/doc/txt/oscam.tiers.txt
--- a/Distribution/doc/txt/oscam.txt
+++ b/Distribution/doc/txt/oscam.txt
--- a/Distribution/doc/txt/oscam.user.txt
+++ b/Distribution/doc/txt/oscam.user.txt
--- a/Distribution/doc/txt/oscam.whitelist.txt
+++ b/Distribution/doc/txt/oscam.whitelist.txt
--- a/Distribution/monitor/mpcsmon-src-0.6.tar.bz2
+++ b/Distribution/monitor/mpcsmon-src-0.6.tar.bz2
--- a/Distribution/monitor/mpcsmon.sh
+++ b/Distribution/monitor/mpcsmon.sh
--- a/0
+++ b/0
--- a/Makefile.extra
+++ b/Makefile.extra
--- a/README.build
+++ b/README.build
--- a/README.config
+++ b/README.config
--- a/README.dvbapi_protocol
+++ b/README.dvbapi_protocol
--- a/README.md
+++ b/README.md
--- a/SoftCam.Key
+++ b/SoftCam.Key
--- a/0
+++ b/0
--- a/config.h
+++ b/config.h
@ -4,11 +4,7 @@
 #define WEBIF 1
 #define WEBIF_LIVELOG 1
 #define WEBIF_JQUERY 1
-<<<<<<< Updated upstream
 //#define WEBIF_WIKI 1
-=======
-#define WEBIF_WIKI 1
->>>>>>> Stashed changes
 #define WITH_COMPRESS_WEBIF 1
 //#define WITH_SSL 1
 #if defined(__linux__) || defined(__CYGWIN__)
@ -18,7 +14,7 @@
 //#define WITH_NEUTRINO 1
 #define READ_SDT_CHARSETS 1
 //#define CLOCKFIX 1
-#define CS_ANTICASC 1
+//#define CS_ANTICASC 1
 #define WITH_DEBUG 1
 #define WITH_LB 1
 #define CS_CACHEEX 1
@ -43,13 +39,8 @@
 //#define MODULE_CONSTCW 1
 //#define MODULE_PANDORA 1
 //#define MODULE_GHTTP 1
-<<<<<<< Updated upstream
 //#define MODULE_SCAM 1
 //#define MODULE_STREAMRELAY 1
-=======
-#define MODULE_SCAM 1
-#define MODULE_STREAMRELAY 1
->>>>>>> Stashed changes

 //#define WITH_CARDREADER 1

--- a/config.mak
+++ b/config.mak
--- a/config.sh
+++ b/config.sh
--- a/cscrypt/CMakeLists.txt
+++ b/cscrypt/CMakeLists.txt
--- a/cscrypt/Makefile
+++ b/cscrypt/Makefile
--- a/cscrypt/aes.c
+++ b/cscrypt/aes.c
--- a/cscrypt/aes.h
+++ b/cscrypt/aes.h
--- a/cscrypt/bn.h
+++ b/cscrypt/bn.h
--- a/cscrypt/bn_add.c
+++ b/cscrypt/bn_add.c
--- a/cscrypt/bn_asm.c
+++ b/cscrypt/bn_asm.c
--- a/cscrypt/bn_ctx.c
+++ b/cscrypt/bn_ctx.c
--- a/cscrypt/bn_div.c
+++ b/cscrypt/bn_div.c
--- a/cscrypt/bn_exp.c
+++ b/cscrypt/bn_exp.c
--- a/cscrypt/bn_lcl.h
+++ b/cscrypt/bn_lcl.h
--- a/cscrypt/bn_lib.c
+++ b/cscrypt/bn_lib.c
--- a/cscrypt/bn_mul.c
+++ b/cscrypt/bn_mul.c
--- a/cscrypt/bn_print.c
+++ b/cscrypt/bn_print.c
--- a/Show More
+++ b/Show More