Permalink
Browse files

Merge branch 'steverobbins-feature/2016'

  • Loading branch information...
dmoagx committed Jan 13, 2016
2 parents f278d9b + a739b2b commit d6087f3e45cb67b57b96df24fbdee4a2995d5825
Showing with 7 additions and 7 deletions.
  1. +1 −1 LICENSE
  2. +2 −2 Resources/English.lproj/InfoPlist.strings
  3. +2 −2 Resources/License.rtf
  4. +1 −1 Resources/Plists/Info.plist
  5. +1 −1 readme.md
View
@@ -1,4 +1,4 @@
Copyright (c) 2002-2015 Sequel Pro & CocoaMySQL Teams.
Copyright (c) 2002-2016 Sequel Pro & CocoaMySQL Teams.
All rights reserved.
@@ -1,4 +1,4 @@
/* Localized versions of Info.plist keys */
CFBundleGetInfoString = "Sequel Pro version 1.0.2, Copyright 2002-2013 Sequel Pro and CocoaMySQL team.";
NSHumanReadableCopyright = "Copyright 2002-2013 Sequel Pro and CocoaMySQL team.";
CFBundleGetInfoString = "Sequel Pro version 1.1, Copyright 2002-2016 Sequel Pro and CocoaMySQL team.";
NSHumanReadableCopyright = "Copyright 2002-2016 Sequel Pro and CocoaMySQL team.";
View
@@ -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 \
}
}
@@ -202,7 +202,7 @@
<key>NSAppleScriptEnabled</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2002-2015 Sequel Pro and CocoaMySQL team.</string>
<string>Copyright 2002-2016 Sequel Pro and CocoaMySQL team.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
View
@@ -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.

0 comments on commit d6087f3

Please sign in to comment.