From 681fdc45473143de3f3c5f69fbc7b94f5d6b0b75 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 25 Jul 2009 09:59:22 +0000
Subject: Merge branch 'plain-etag'

Conflicts:
	ui-shared.c
---
(limited to 'cgit.h')

diff --git a/cgit.h b/cgit.h
index 00aca4c..07a277a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -180,6 +180,7 @@ struct cgit_page {
 	char *mimetype;
 	char *charset;
 	char *filename;
+	char *etag;
 	char *title;
 	int status;
 	char *statusmsg;
--
cgit v0.9.0.2