From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 22 Jul 2007 21:57:48 +0000 (+0200)
Subject: Merge branch 'master' of git://git.klever.net/patchwork/cgit
X-Git-Tag: v0.6~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0;p=cgit

Merge branch 'master' of git://git.klever.net/patchwork/cgit

* 'master' of git://git.klever.net/patchwork/cgit:
  link raw blob from tree file view
  fix: changed view link to blob in summary.
  allow selective enabling of snapshots
  shorten snapshot names to repo basename
  introduce cgit_repobasename
  added snapshot filename to the link
  add plain uncompressed tar snapshort format
  introduced .tar.bz2 snapshots
  compress .tar.gz using gzip as a filter
  added a chk_non_negative check
  css: adjust vertical-align of commit info th cells
  add support for snapshot tarballs

Conflicts:

	ui-summary.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---

1d4aaff696ee1b9085dda0f0f3d84d9d20d96db0
diff --cc cgit.h
index 610a16d,ea61be7..eddcaa3
--- a/cgit.h
+++ b/cgit.h
@@@ -230,10 -233,11 +235,12 @@@ extern void cgit_print_log(const char *
  extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
  extern void cgit_print_tree(const char *rev, char *path);
  extern void cgit_print_commit(char *hex);
 +extern void cgit_print_tag(char *revname);
  extern void cgit_print_diff(const char *new_hex, const char *old_hex);
  extern void cgit_print_snapshot(struct cacheitem *item, const char *hex,
- 				const char *format, const char *prefix,
- 				const char *filename);
+ 				const char *prefix, const char *filename,
+ 				int snapshot);
+ extern void cgit_print_snapshot_links(const char *repo, const char *hex,int snapshots);
+ extern int cgit_parse_snapshots_mask(const char *str);
  
  #endif /* CGIT_H */