From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Wed, 25 Jan 2006 16:22:22 +0000 (+0000)
Subject: Update
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f15ae5074582b8909cd74b23a79c1a9ae9ecee4;p=pspp

Update
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d2e0872d74..c516b148bc 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-25  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* argp-namefrob.h: Bugfix. Remove stray #
+
 2006-01-25  Bruno Haible  <bruno@clisp.org>
 
 	* stdbool_.h (_Bool) [IRIX cc]: Define as 'signed char', to avoid
@@ -29,6 +33,7 @@
 	* socket_.h (SHUT_WR, SHUT_RDWR): Don't hardcode, suggested by
 	Bruno.
 
+>>>>>>> 1.1090
 2006-01-23  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Work around porting bugs reported by Dieter in