Skip to content

Commit edf2676

Browse files
qmatheqmathe
committed
Merge branch 'master' of http://github.com/etoile/CoreObject 
2 parents 197e93b + c0596b6 commit edf2676

11 files changed

Lines changed: 369 additions & 62 deletions

File tree

‎COPYING‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013 Eric Wasylishen, Quentin Mathe, Christopher Armstrong
1+
Copyright (c) 2010-2014 Eric Wasylishen, Quentin Mathe, Christopher Armstrong
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ The Xcode projects and schemes of interest are:
133133
- CoreObject/Samples/Typewriter/Typerwriter.xcodeproj
134134
- Typewriter - a reasonably polished note manager that uses CoreObject
135135

136-
For more details, see [INSTALL.Cocoa](INSTALL.Cocoa.md) or [INSTALL.GNUstep](INSTALL.GNUstep.md).
136+
For more details, see [INSTALL.Cocoa](https://github.com/etoile/CoreObject/blob/master/INSTALL.Cocoa.md) or [INSTALL.GNUstep](https://github.com/etoile/CoreObject/blob/master/INSTALL.GNUstep.md).
137137

138138

139139
Mac OS X support

‎Samples/ProjectDemo/English.lproj/Credits.rtf‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200
2+
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier-Bold;\f2\fmodern\fcharset0 Courier;
3+
}
4+
{\colortbl;\red255\green255\blue255;}
5+
\margl1440\margr1440\vieww10800\viewh8400\viewkind0
6+
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
7+
8+
\f0\b\fs24 \cf0 CoreObject
9+
\b0 \
10+
Copyright (c) 2010-2014 Eric Wasylishen, Quentin Mathe, Christopher Armstrong\
11+
\
12+
Permission is hereby granted, free of charge, to any person obtaining a copy\
13+
of this software and associated documentation files (the "Software"), to deal\
14+
in the Software without restriction, including without limitation the rights\
15+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\
16+
copies of the Software, and to permit persons to whom the Software is\
17+
furnished to do so, subject to the following conditions:\
18+
\
19+
The above copyright notice and this permission notice shall be included in\
20+
all copies or substantial portions of the Software.\
21+
\
22+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\
23+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\
24+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\
25+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\
26+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\
27+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\
28+
THE SOFTWARE.\
29+
\
30+
31+
\b diff.hh
32+
\b0 \
33+
diff.cs: A port of the algorythm to C#\
34+
\
35+
Software License Agreement (BSD License)\
36+
Copyright (c) 2005-2009 by Matthias Hertel, http://www.mathertel.de/\
37+
\
38+
All rights reserved.\
39+
\
40+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\
41+
\
42+
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\
43+
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.\
44+
Neither the name of the copyright owners nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.\
45+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.\
46+
\
47+
\pard\pardeftab720
48+
49+
\f1\b\fs26 \cf0 GCDAsyncSocket: (Public Domain)
50+
\f2\b0 \
51+
\
52+
This class is released under the public domain.\
53+
Originally created by Robbie Hanson in Q3 2010.\
54+
Updated and maintained by Deusty LLC and the Mac/iOS development community.\
55+
\
56+
57+
\f1\b CocoaLumberjack: (BSD Style License)
58+
\f2\b0 \
59+
\
60+
Copyright (c) 2010, Deusty, LLC\
61+
All rights reserved.\
62+
\
63+
Redistribution and use of this software in source and binary forms,\
64+
with or without modification, are permitted provided that the following conditions are met:\
65+
\
66+
* Redistributions of source code must retain the above\
67+
copyright notice, this list of conditions and the\
68+
following disclaimer.\
69+
\
70+
* Neither the name of Deusty nor the names of its\
71+
contributors may be used to endorse or promote products\
72+
derived from this software without specific prior\
73+
written permission of Deusty, LLC.\
74+
\
75+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.\
76+
\
77+
78+
\f1\b XMPPFramework: (BSD Style License)
79+
\f2\b0 \
80+
\
81+
Software License Agreement (BSD License)\
82+
\
83+
Copyright (c) 2007, Deusty Designs, LLC\
84+
All rights reserved.\
85+
\
86+
Redistribution and use of this software in source and binary forms,\
87+
with or without modification, are permitted provided that the following conditions are met:\
88+
\
89+
* Redistributions of source code must retain the above\
90+
copyright notice, this list of conditions and the\
91+
following disclaimer.\
92+
\
93+
* Neither the name of Deusty Designs nor the names of its\
94+
contributors may be used to endorse or promote products\
95+
derived from this software without specific prior\
96+
written permission of Deusty Designs, LLC.\
97+
\
98+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
99+
\f0\fs24 \
100+
\
101+
102+
\b Sketch\
103+
\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
104+
105+
\b0 \cf0 \
106+
IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in\
107+
consideration of your agreement to the following terms, and your use, installation,\
108+
modification or redistribution of this Apple software constitutes acceptance of these\
109+
terms. If you do not agree with these terms, please do not use, install, modify or\
110+
redistribute this Apple software.\
111+
\
112+
In consideration of your agreement to abide by the following terms, and subject to these\
113+
terms, Apple grants you a personal, non-exclusive license, under Apple's copyrights in\
114+
this original Apple software (the "Apple Software"), to use, reproduce, modify and\
115+
redistribute the Apple Software, with or without modifications, in source and/or binary\
116+
forms; provided that if you redistribute the Apple Software in its entirety and without\
117+
modifications, you must retain this notice and the following text and disclaimers in all\
118+
such redistributions of the Apple Software. Neither the name, trademarks, service marks\
119+
or logos of Apple Computer, Inc. may be used to endorse or promote products derived from\
120+
the Apple Software without specific prior written permission from Apple. Except as expressly\
121+
stated in this notice, no other rights or licenses, express or implied, are granted by Apple\
122+
herein, including but not limited to any patent rights that may be infringed by your\
123+
derivative works or by other works in which the Apple Software may be incorporated.\
124+
\
125+
The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO WARRANTIES,\
126+
EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT,\
127+
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS\
128+
USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.\
129+
\
130+
IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL\
131+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS\
132+
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE,\
133+
REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND\
134+
WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR\
135+
OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.}

0 commit comments

Comments
 (0)