From ce7682c2a468e926d6b38e4f95bd289a8d26222c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 18 Jul 2007 21:22:40 +0000 Subject: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions. --- indra/lib/python/indra/__init__.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'indra/lib/python') diff --git a/indra/lib/python/indra/__init__.py b/indra/lib/python/indra/__init__.py index bbfdbaf98d..7db53666e8 100644 --- a/indra/lib/python/indra/__init__.py +++ b/indra/lib/python/indra/__init__.py @@ -1,7 +1,5 @@ -"""\ -@file __init__.py -@brief Initialization file for the indra module. - -Copyright (c) 2006-2007, Linden Research, Inc. -$License$ -""" +# @file __init__.py +# @brief Initialization file for the indra module. +# +# Copyright (c) 2006-$CurrentYear$, Linden Research, Inc. +# $License$ -- cgit v1.2.3