aboutsummaryrefslogtreecommitdiff
path: root/jimsh.c
diff options
context:
space:
mode:
authorWojciech A. Koszek <wkoszek@laptop.freebsd.czest.pl>2010-01-31 22:53:55 +0000
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-02-01 13:20:27 +0100
commitfb76eaf8f1f24a394618d4e757cb2b203055ae17 (patch)
treee023372736a904a6cb23145142ec67d3c88545fa /jimsh.c
parent4bcedeb67723496092aa8c29674cc5a1691e205c (diff)
downloadjimtcl-fb76eaf8f1f24a394618d4e757cb2b203055ae17.zip
jimtcl-fb76eaf8f1f24a394618d4e757cb2b203055ae17.tar.gz
jimtcl-fb76eaf8f1f24a394618d4e757cb2b203055ae17.tar.bz2
Revert "Bring correct license -- I think freebsd/ directory has an agreements"
This reverts commit 1e2fdd7d9e877fbe2c88a4c32f098ce1e575dc1d.
Diffstat (limited to 'jimsh.c')
-rw-r--r--jimsh.c39
1 files changed, 14 insertions, 25 deletions
diff --git a/jimsh.c b/jimsh.c
index dfa5d8f..518b53a 100644
--- a/jimsh.c
+++ b/jimsh.c
@@ -1,32 +1,21 @@
-/*-
- * Copyright (c) 2005 Salvatore Sanfilippo <antirez@invece.org>
- * Copyright (c) 2009 Steve Bennett <steveb@workware.net.au>
- * All rights reserved.
+/* Jimsh - An interactive shell for Jim
+ * Copyright 2005 Salvatore Sanfilippo <antirez@invece.org>
+ * Copyright 2009 Steve Bennett <steveb@workware.net.au>
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * $Id$
+ * A copy of the license is also included in the source distribution
+ * of Jim, as a TXT file name called LICENSE.
*
- * Jimsh - An interactive shell for Jim
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
#ifdef WIN32