diff options
author | Tatsuya Kinoshita <tats@debian.org> | 2013-07-30 11:13:51 +0000 |
---|---|---|
committer | Tatsuya Kinoshita <tats@debian.org> | 2013-07-30 11:13:51 +0000 |
commit | 18b0cc756bc5d5145fc1abcd0ef46ff2455c79ab (patch) | |
tree | 88966004acc26ea238b5414bd569b86aac1b569d /config.h.in | |
parent | Sort anchors by sequence number in -dump (diff) | |
parent | Merge branch 'feature/debian-version' (diff) | |
download | w3m-18b0cc756bc5d5145fc1abcd0ef46ff2455c79ab.tar.gz w3m-18b0cc756bc5d5145fc1abcd0ef46ff2455c79ab.zip |
Merge branch 'master' into bug/sort-dump-links
Conflicts:
main.c
Diffstat (limited to '')
-rw-r--r-- | config.h.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config.h.in b/config.h.in index 2f41eed..59997b4 100644 --- a/config.h.in +++ b/config.h.in @@ -25,6 +25,7 @@ #define PASSWD_FILE RC_DIR "/passwd" #define PRE_FORM_FILE RC_DIR "/pre_form" +#define SITECONF_FILE RC_DIR "/siteconf" #define USER_MAILCAP RC_DIR "/mailcap" #define SYS_MAILCAP CONF_DIR "/mailcap" #define USER_MIMETYPES "~/.mime.types" |