Permalink
Browse files

Merge branch 'master' into 1_0_public_release

  • Loading branch information...
2 parents 4b9db84 + 8b58ecd commit c212e1ac6ccc32ae9b583c3699a393f3f7856ca6 @capttaco committed Aug 29, 2010
Showing with 19 additions and 15 deletions.
  1. +19 −15 LICENSE
View
34 LICENSE
@@ -1,27 +1,31 @@
-Copyright (c) 2009, Rob Rhyne
-http://robrhyne.com/
+Copyright (c) 2009-2010, Rob Rhyne
+Briefs™ is a trademark of Digital Arch Design Corp.
+http://robrhyne.com/
+http://digitalarch.net/
All rights reserved.
+
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
+restriction except as noted below, including without limitation
+the rights to use,copy, modify, merge, publish, distribute,
+and/or sublicense, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+ The Software and/or source code cannot be copied in whole and
+ sold without meaningful modification for a profit.
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
-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.
+ Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 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.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

0 comments on commit c212e1a

Please sign in to comment.