Merge.
authorChris Jones <christian.jones@sri.com>
Sun, 09 Feb 2014 09:52:28 -0700
changeset 183 b4bd77d58a3e
parent 182 626c390682fc (diff)
parent 181 750bc33ccdda (current diff)
child 184 ce49140fe60b
Merge.
README
TODO.txt
xmpp/log.go
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE.txt	Sun Feb 09 09:52:28 2014 -0700
@@ -0,0 +1,25 @@
+Copyright (c) 2014, Chris Jones <chris@cjones.org>
+All rights reserved.
+
+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.
+
+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
+HOLDER 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.
--- a/README	Sat Nov 09 12:37:49 2013 -0700
+++ b/README	Sun Feb 09 09:52:28 2014 -0700
@@ -12,3 +12,8 @@
 An simple client using this library is in the example directory. A
 more interesting example can be found at
 https://cjones.org/hg/foosfiend.
+
+This software is written by Chris Jones <chris@cjones.org>. If you use
+it, I'd appreciate a note letting me know. Bug reports are
+welcome. The license is in LICENSE.txt; it's a BSD 2-Clause license
+from http://opensource.org/licenses/BSD-2-Clause.