summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jon Bernard <jbernard@tuxion.com> 2011-11-01 13:10:01 -0400
committerGravatar Jon Bernard <jbernard@tuxion.com> 2011-11-01 13:10:01 -0400
commitaf27db8aed8d3aa7695bc35b9c2180aa90757635 (patch)
treebe8c182f96477bac720415debafee0014dffb697
parent05970aa663f75692c127715ee78ea101a34734d9 (diff)
parent0b6ecf16418a3b942470b4daf175bd1e00f21c96 (diff)
downloaddotfiles-a1e6b5431f8620bca2f2eb8d3419fb74d5021601.tar.gz
dotfiles-a1e6b5431f8620bca2f2eb8d3419fb74d5021601.tar.bz2
dotfiles-a1e6b5431f8620bca2f2eb8d3419fb74d5021601.zip
Merge branch 'release/0.5.1'v0.5.1
-rw-r--r--HISTORY.rst5
-rw-r--r--LICENSE.rst22
-rw-r--r--dotfiles/core.py2
3 files changed, 17 insertions, 12 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index eec2e39..6f874d1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,11 @@
History
-------
+0.5.1
++++++
+
+* Fix license formatting
+
0.5.0
+++++
diff --git a/LICENSE.rst b/LICENSE.rst
index 0958440..d7d596d 100644
--- a/LICENSE.rst
+++ b/LICENSE.rst
@@ -3,16 +3,16 @@ License
ISC License. ::
-Copyright (c) 2011, Jon Bernard <jbernard@tuxion.com>
+ Copyright (c) 2011, Jon Bernard <jbernard@tuxion.com>
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/dotfiles/core.py b/dotfiles/core.py
index 12226fa..aa0dce9 100644
--- a/dotfiles/core.py
+++ b/dotfiles/core.py
@@ -12,7 +12,7 @@ import shutil
import fnmatch
-__version__ = '0.5.0'
+__version__ = '0.5.1'
__author__ = 'Jon Bernard'
__license__ = 'ISC'