From ce095facb60fab0124d4dbed58fa59110c04ce92 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sun, 13 Jan 2013 23:02:00 +0000
Subject: Manual update to last merge SHA

---
 misc/last-merged-ioq3-revision | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'misc/last-merged-ioq3-revision')

diff --git a/misc/last-merged-ioq3-revision b/misc/last-merged-ioq3-revision
index 3bdaa175..de2d66e3 100644
--- a/misc/last-merged-ioq3-revision
+++ b/misc/last-merged-ioq3-revision
@@ -1 +1 @@
-693e51c6544f1b903d6a6587c4d9d8bd520d104b
+70b165ee336c9fb7086a628bb8e3e9721bcd920b
-- 
cgit