aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-08-19 20:01:42 -0500
committerBrent Cook <bcook@openbsd.org>2015-08-19 20:01:42 -0500
commit2f2f08e60c8ade1840c2ff31ec36e934ef6d03ec (patch)
tree4e245176bd777bef9b6579c0627fbdefa917ab53
parent9aa4e1d96095c5bde62aa541a6b3aa48110cc5b0 (diff)
downloadportable-2f2f08e60c8ade1840c2ff31ec36e934ef6d03ec.tar.gz
portable-2f2f08e60c8ade1840c2ff31ec36e934ef6d03ec.tar.bz2
portable-2f2f08e60c8ade1840c2ff31ec36e934ef6d03ec.zip
update to pull from OPENBSD_5_8
-rw-r--r--OPENBSD_BRANCH2
1 files changed, 1 insertions, 1 deletions
diff --git a/OPENBSD_BRANCH b/OPENBSD_BRANCH
index 1f7391f..0d61840 100644
--- a/OPENBSD_BRANCH
+++ b/OPENBSD_BRANCH
@@ -1 +1 @@
master OPENBSD_5_8