aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/doas/CVS/Entries
diff options
context:
space:
mode:
authorCem Keylan <cem@ckyln.com>2021-07-14 14:39:31 +0300
committerCem Keylan <cem@ckyln.com>2021-07-14 14:39:31 +0300
commit89c23755c8ab5d8c5bbbfa6e40eb0c6bda109dad (patch)
tree0619d977ce4ceecca0523f20a0609a293440e030 /usr.bin/doas/CVS/Entries
parent0ea3661a6ba0baaa39b95e836e8f2c87e2f4c20f (diff)
downloadotools-89c23755c8ab5d8c5bbbfa6e40eb0c6bda109dad.tar.gz
update CVS
Diffstat (limited to 'usr.bin/doas/CVS/Entries')
-rw-r--r--usr.bin/doas/CVS/Entries14
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/doas/CVS/Entries b/usr.bin/doas/CVS/Entries
index 0b2860e..bda4789 100644
--- a/usr.bin/doas/CVS/Entries
+++ b/usr.bin/doas/CVS/Entries
@@ -1,8 +1,8 @@
-/Makefile/1.3/Mon Jul 3 22:21:47 2017//
-/doas.1/1.23/Thu Jul 4 19:04:17 2019//
-/doas.c/1.82/Fri Oct 18 17:15:45 2019//
-/doas.conf.5/1.43/Sat May 16 16:58:11 2020//
-/doas.h/1.15/Mon Jun 17 19:51:23 2019//
-/env.c/1.10/Sun Jul 7 19:21:28 2019//
-/parse.y/1.27/Wed Jul 11 07:39:22 2018//
+/Makefile/1.3/Mon Oct 19 10:36:43 2020//
+/doas.1/1.25/Result of merge//
+/doas.c/1.90/Result of merge+Wed Jul 14 11:14:15 2021//
+/doas.conf.5/1.45/Wed Jul 14 11:14:15 2021//
+/doas.h/1.17/Result of merge//
+/env.c/1.10/Mon Oct 19 10:36:43 2020//
+/parse.y/1.29/Result of merge//
D