Merge branch 'master' into scrollback-completion

This commit is contained in:
Daniel Micay 2012-06-06 21:07:05 -04:00
commit 220f98fb28
1 changed files with 0 additions and 1 deletions

View File

@ -16,7 +16,6 @@ static const char *url_regex = "(ftp|http)s?://[-a-zA-Z0-9.?$%&/=_~#.,:;+]*";
static const char *font = "Monospace 9";
static const long scrollback_lines = 1000;
static const bool cursor_blink = false;
static const char *foreground_color = "#dcdccc";
static const char *background_color = "#3f3f3f";