summaryrefslogtreecommitdiff
path: root/misc/last-merged-ioq3-revision
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2016-04-09 17:57:28 +0100
committerTim Angus <tim@ngus.net>2016-04-09 17:57:28 +0100
commitf45fbef604e05144057dec8d1dbfc5d4f5a2a822 (patch)
tree152d2a428b078f7a89756ea9e156695fc69f1686 /misc/last-merged-ioq3-revision
parent7f9e97d611b4b267d9dd913144cb9632f96c90c2 (diff)
parent87abdd914988724e164ffb16380ad26be8420b84 (diff)
Merge branch 'master' into gpp
Diffstat (limited to 'misc/last-merged-ioq3-revision')
-rw-r--r--misc/last-merged-ioq3-revision2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/last-merged-ioq3-revision b/misc/last-merged-ioq3-revision
index cc9c1499..4cdf56c4 100644
--- a/misc/last-merged-ioq3-revision
+++ b/misc/last-merged-ioq3-revision
@@ -1 +1 @@
-708fe6937a7bf4a838766d1c3a07552160ab4f1e
+1f6703821f11be9c711c6ee42371ab290dd12776