aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorDavid Phillips <dbphillipsnz@gmail.com>2016-03-14 16:04:05 +1300
committerDavid Phillips <dbphillipsnz@gmail.com>2016-03-14 16:04:05 +1300
commit34e34f456cce4aabe3806f7dc6438d6e03f32b10 (patch)
tree7d1c0f79eaf3a786f56557c2535e4f59c6d32c8d /LICENSE
parentb4607e0d51a1982272460e0ab9af359d92876f3f (diff)
parent1ffe28ca0ef8eab3dc1528d4f035377591935466 (diff)
downloadpetrichor-34e34f456cce4aabe3806f7dc6438d6e03f32b10.tar.xz
Merge branch 'develop' into release
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE2
1 files changed, 1 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 171e2d3..30eccb6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
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.
+ and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.