aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <post@wickenrode.com>2016-01-13 18:09:36 +0100
committerMax <post@wickenrode.com>2016-01-13 18:09:36 +0100
commit8b44ff9111c41a65185ebefff4b39dfe3e91364a (patch)
treea1a07b12639c8880f6e8518d8852d1c9a0a86b36
parentf278d9bae2d65593105fee457a7a69abf1ae9c9e (diff)
parenta9dd68e95cc15ad0370998d0769f2110871f322c (diff)
downloadsequelpro-8b44ff9111c41a65185ebefff4b39dfe3e91364a.tar.gz
sequelpro-8b44ff9111c41a65185ebefff4b39dfe3e91364a.tar.bz2
sequelpro-8b44ff9111c41a65185ebefff4b39dfe3e91364a.zip
Merge branch 'feature/2016' of https://github.com/steverobbins/sequelpro into steverobbins-feature/2016
-rw-r--r--LICENSE2
-rw-r--r--Resources/License.rtf4
-rw-r--r--readme.md2
3 files changed, 4 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index 3e5f86db..cdd8f828 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2002-2015 Sequel Pro & CocoaMySQL Teams.
+Copyright (c) 2002-2016 Sequel Pro & CocoaMySQL Teams.
All rights reserved.
diff --git a/Resources/License.rtf b/Resources/License.rtf
index a9ce83c0..5f5e1c22 100644
--- a/Resources/License.rtf
+++ b/Resources/License.rtf
@@ -5,7 +5,7 @@
\deftab560
\pard\tx560\pardeftab560\pardirnatural
-\f0\b\fs22 \cf2 \CocoaLigature0 Copyright (c) 2002-2015 Sequel Pro & CocoaMySQL Teams. \
+\f0\b\fs22 \cf2 \CocoaLigature0 Copyright (c) 2002-2016 Sequel Pro & CocoaMySQL Teams. \
\
All rights reserved.
\b0 \
@@ -34,4 +34,4 @@ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN \
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER \
DEALINGS IN THE SOFTWARE.
\b0 \cf0 \CocoaLigature1 \
-} \ No newline at end of file
+}
diff --git a/readme.md b/readme.md
index 25c4206c..9b17f34a 100644
--- a/readme.md
+++ b/readme.md
@@ -20,6 +20,6 @@ Build Instructions
License
=======
-Copyright (c) 2002-2015 Sequel Pro & CocoaMySQL Teams. All rights reserved.
+Copyright (c) 2002-2016 Sequel Pro & CocoaMySQL Teams. All rights reserved.
Sequel Pro is free and open source software, licensed under [MIT](http://opensource.org/licenses/MIT). See [LICENSE](https://github.com/sequelpro/sequelpro/blob/master/LICENSE) for full details.