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>

diff --cc cgit.c
Simple merge

diff --cc cgit.h
index 610a16db18a55728d93823c94c54fd28b1608f21,ea61be7446e0b005c2c6161dae6e35f949e4d687..eddcaa310006a386829dd054046a64502bfd5dbf
--- 1/cgit.h
--- 2/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 */

diff --cc shared.c
Simple merge

diff --cc ui-shared.c
Simple merge