diff options
| author |  Jon Bernard <jbernard@tuxion.com>
| 2011-11-01 13:10:09 -0400 |
|---|---|---|
| committer | Jon Bernard <jbernard@tuxion.com>
| 2011-11-01 13:10:09 -0400 |
| commit | 95bfb2aeee32020816f87c16c8abdbabf80ca3ba (patch) | |
| tree | be8c182f96477bac720415debafee0014dffb697 | |
| parent | c018cb50c4a157c984826f9676acb96ff2c7756c (diff) | |
| parent | 0b6ecf16418a3b942470b4daf175bd1e00f21c96 (diff) | |
| download | dotfiles-95bfb2aeee32020816f87c16c8abdbabf80ca3ba.tar.gz dotfiles-95bfb2aeee32020816f87c16c8abdbabf80ca3ba.tar.bz2 dotfiles-95bfb2aeee32020816f87c16c8abdbabf80ca3ba.zip | |
Merge branch 'release/0.5.1' into develop
| -rw-r--r-- | HISTORY.rst | 5 | ||||
| -rw-r--r-- | LICENSE.rst | 22 | ||||
| -rw-r--r-- | dotfiles/core.py | 2 |
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' |