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
 

webif/pages_wiki.h

@@ -1,31 +0,0 @@
-/*
- * OSCam WebIf Wiki data - AUTO GENERATED, DO NOT EDIT!
- * Generated by wiki_gen from wiki markdown files
- */
-#ifndef WEBIF_PAGES_WIKI_H_
-#define WEBIF_PAGES_WIKI_H_
-
-#ifdef WEBIF_WIKI
-
-#define COMPRESSED_WIKI 1
-
-struct wiki_entry {
-	uint32_t param_ofs;
-	uint32_t config_ofs;
-	uint32_t section_ofs;
-	uint32_t text_ofs;
-	int8_t status;
-};
-
-int32_t wiki_count(void);
-const struct wiki_entry *wiki_get_entries(void);
-const char *wiki_get_help(const char *config, const char *section, const char *param);
-int8_t wiki_get_status(const char *config, const char *section, const char *param);
-void wiki_get_data(const char **data, size_t *data_len, size_t *data_olen);
-char *wiki_get_decompressed_data(void);
-void webif_wiki_prepare(void);
-void webif_wiki_free(void);
-
-#endif /* WEBIF_WIKI */
-
-#endif /* WEBIF_PAGES_WIKI_H_ */

wiki

@@ -1 +0,0 @@
-Subproject commit d29a5a8242d9c7fa8e9b23e79d5b3d884f6d890d