summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/cvs.h
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/cvs/cvs.h')
-rw-r--r--usr.bin/cvs/cvs.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index cc601ecad4c..e3daafc512b 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cvs.h,v 1.158 2008/02/09 20:04:00 xsa Exp $ */
+/* $OpenBSD: cvs.h,v 1.159 2008/02/10 10:10:15 joris Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -264,10 +264,11 @@ struct cvsroot {
struct cvs_ent {
char *ce_buf;
+ char *ce_conflict;
char *ce_name;
char *ce_opts;
char *ce_tag;
- char *ce_conflict;
+ time_t *ce_date;
time_t ce_mtime;
u_int16_t ce_type;
u_int16_t ce_status;