From e03bb0606a10f29c8b94909a713a5bb5c69e88b7 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 21 Jun 2007 22:40:22 +0000
Subject: merge -r62831:64079 branches/maintenance to release

---
 indra/llcommon/llsdutil.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/llsdutil.cpp')

diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index 5a0a76b3f3..e6d9396f7d 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -277,4 +277,4 @@ char* ll_pretty_print_sd(const LLSD& sd)
 	strncpy(buffer, stream.str().c_str(), bufferSize);
 	buffer[bufferSize - 1] = '\0';
 	return buffer;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3