summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--mux.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b85350453..aac1b7193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
120100128
2 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2010/01/26 02:15:20
4 [mux.c]
5 -Wuninitialized and remove a // comment; from portable
6 (Id sync only)
7
120100126 820100126
2 - (djm) OpenBSD CVS Sync 9 - (djm) OpenBSD CVS Sync
3 - tedu@cvs.openbsd.org 2010/01/17 21:49:09 10 - tedu@cvs.openbsd.org 2010/01/17 21:49:09
diff --git a/mux.c b/mux.c
index dcd6dc028..ef99b5737 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.10 2010/01/26 01:28:35 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.11 2010/01/26 02:15:20 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
4 * 4 *