From 70798143f003198c1fedcf4c5f9afdd759ac78a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 16 Jun 2005 19:55:13 +0000
Subject: [PATCH] x

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15437 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/sl/ChangeLog | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/lib/sl/ChangeLog b/lib/sl/ChangeLog
index af4591c42..eded5f652 100644
--- a/lib/sl/ChangeLog
+++ b/lib/sl/ChangeLog
@@ -1,3 +1,17 @@
+2005-06-16  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* slc-gram.y: fix a merge error
+	
+	* slc-gram.y: rename optind to optidx, rename variables to avoid
+	shadowing
+
+	* make_cmds.c: rename optind to optidx, move variable define to
+	avoid shadowing
+
+	* ss.c: rename index to idx
+	
+	* sl.c: use rk_UNCONST to un-constify
+
 2005-05-10  Dave Love  <fx@gnu.org>
 
 	* slc-lex.l: Include <stdlib.h>.