Skip to content

Commit

Permalink
merge whitespace fixes from sofia-sip tree
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10802 d0543943-73ff-0310-b7d9-9358b9ac24b2
  • Loading branch information
mjerris committed Dec 16, 2008
1 parent 918bc1d commit d5bf915
Show file tree
Hide file tree
Showing 489 changed files with 10,287 additions and 10,290 deletions.
3 changes: 1 addition & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Urpalainen, Jari <[email protected]>
Whittaker, Colin <colinw -at occamnetworks -dot com>
Zabaluev, Mikhail <[email protected]>

Note: for details on who did what, see the version control
Note: for details on who did what, see the version control
system change history, and release notes for past releases at
http://sofia-sip.sourceforge.net/relnotes/

2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.

1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
Expand Down
38 changes: 19 additions & 19 deletions COPYRIGHTS
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This package contains the Sofia-SIP library.

Copyright (C) 2005-2006 Nokia Corporation and others (see the
Copyright (C) 2005-2006 Nokia Corporation and others (see the
in individual files for a detailed list of copyright holders).

Contact: Pekka Pessi <[email protected]>
Expand Down Expand Up @@ -102,23 +102,23 @@ libsofia-sip-ua/su/getopt.c
The package also contains files licensed by IBM Corporation. These files are
distributed with the following copyright notice:

This module contains code made available by IBM
Corporation on an AS IS basis. Any one receiving the
module is considered to be licensed under IBM copyrights
to use the IBM-provided source code in any way he or she
deems fit, including copying it, compiling it, modifying
it, and redistributing it, with or without
modifications. No license under any IBM patents or
patent applications is to be implied from this copyright
license.
This module contains code made available by IBM
Corporation on an AS IS basis. Any one receiving the
module is considered to be licensed under IBM copyrights
to use the IBM-provided source code in any way he or she
deems fit, including copying it, compiling it, modifying
it, and redistributing it, with or without
modifications. No license under any IBM patents or
patent applications is to be implied from this copyright
license.

A user of the module should understand that IBM cannot
provide technical support for the module and will not be
responsible for any consequences of use of the program.
A user of the module should understand that IBM cannot
provide technical support for the module and will not be
responsible for any consequences of use of the program.

Any notices, including this one, are not to be removed
from the module without the prior written consent of
IBM.
Any notices, including this one, are not to be removed
from the module without the prior written consent of
IBM.

----------------------------------------------------------------------------

Expand Down Expand Up @@ -149,7 +149,7 @@ Copyright (c) 1994 Sun Microsystems, Inc.

The following license.terms for information on usage and redistribution
of this individual file, and for a DISCLAIMER OF ALL WARRANTIES.

This software is copyrighted by the Regents of the University of
California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
Corporation and other parties. The following terms apply to all files
Expand Down Expand Up @@ -181,15 +181,15 @@ MODIFICATIONS.

GOVERNMENT USE: If you are acquiring this software on behalf of the
U.S. government, the Government shall have only "Restricted Rights"
in the software and related documentation as defined in the Federal
in the software and related documentation as defined in the Federal
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
are acquiring the software on behalf of the Department of Defense, the
software shall be classified as "Commercial Computer Software" and the
Government shall have only "Restricted Rights" as defined in Clause
252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
authors grant the U.S. Government and others acting in its behalf
permission to use and distribute the software in accordance with the
terms specified in this license.
terms specified in this license.

----------------------------------------------------------------------------

Expand Down
6 changes: 3 additions & 3 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
ChangeLog / Sofia-SIP - SIP User-Agent library
===============================================================

Sofia-SIP library ChangeLog files are available in the
Sofia-SIP library ChangeLog files are available in the
following places:

- per subdirectory ChangeLog files
- all non-trivial changes to files (unless documented
- per subdirectory ChangeLog files
- all non-trivial changes to files (unless documented
elsewhere)
- version control system changelogs
- darcs and CVS tree repositories (see README.developers
Expand Down
Loading

0 comments on commit d5bf915

Please sign in to comment.