author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:12 (UTC) |
commit | 6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch) (unidiff) | |
tree | 49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /cgit.c | |
parent | 37a24e4e39737edaa5cdde501346a65eeb280e63 (diff) | |
parent | d20313e3daf855ee5d4808e050f54614c200d7b1 (diff) | |
download | cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.bz2 |
Merge branch 'jh/context-lines'
Conflicts:
cgit.c
cgit.h
-rw-r--r-- | cgit.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -257,8 +257,10 @@ static void querystring_cb(const char *name, const char *value) | |||
257 | } else if (!strcmp(name, "ss")) { | 257 | } else if (!strcmp(name, "ss")) { |
258 | ctx.qry.ssdiff = atoi(value); | 258 | ctx.qry.ssdiff = atoi(value); |
259 | } else if (!strcmp(name, "all")) { | 259 | } else if (!strcmp(name, "all")) { |
260 | ctx.qry.show_all = atoi(value); | 260 | ctx.qry.show_all = atoi(value); |
261 | } else if (!strcmp(name, "context")) { | ||
262 | ctx.qry.context = atoi(value); | ||
261 | } | 263 | } |
262 | } | 264 | } |
263 | 265 | ||
264 | char *xstrdupn(const char *str) | 266 | char *xstrdupn(const char *str) |