summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormickey <mickey@openbsd.org>2006-06-27 15:27:56 +0000
committermickey <mickey@openbsd.org>2006-06-27 15:27:56 +0000
commit750ab353900c177fdb4ca8ed96ce5c7ff03af2f5 (patch)
treec4d982f5b0615a165b5f1e2d9c3d42fbec372e6d
parentbye bye (diff)
downloadwireguard-openbsd-750ab353900c177fdb4ca8ed96ce5c7ff03af2f5.tar.xz
wireguard-openbsd-750ab353900c177fdb4ca8ed96ce5c7ff03af2f5.zip
97 merger; from king of nynex
-rw-r--r--usr.bin/calendar/calendars/calendar.history3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history
index 330b7a4ea9b..edab94a9017 100644
--- a/usr.bin/calendar/calendars/calendar.history
+++ b/usr.bin/calendar/calendars/calendar.history
@@ -1,7 +1,7 @@
/*
* History
*
- * $OpenBSD: calendar.history,v 1.46 2006/06/26 10:29:52 mickey Exp $
+ * $OpenBSD: calendar.history,v 1.47 2006/06/27 15:27:56 mickey Exp $
*/
#ifndef _calendar_history_
@@ -271,6 +271,7 @@
08/13 Berlin wall erected, 1961
08/13 Li'l Abner debut, 1934
08/14 Social Security begins in U.S., 1935
+08/14 NYNEX merges with Bell Atlantic, 1997
08/14 North-East American blackout, 2003
08/15 Hurricane hits Plymouth Plantation, 1635
08/15 Gandhi's movement obtains independence for Pakistan and India, 1947