Skip to content

Commit

Permalink
Merge branch 'refs/heads/release/1.0.1' into 1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
beccadax committed Jul 31, 2013
2 parents c1ead1b + 4aba71b commit 8fee123
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ Portions of the code that are original to SyntaxKit are distributed under the MI

In general, consult the comments at the top of each file to see how that file is licensed; if you don't see a comment, you may assume it's SyntaxKit code carrying the MIT license.

[uksyntax]: https://github.com/uliwitness/UKSyntaxColoredTextDocument
[noodleline]: http://www.noodlesoft.com/blog/2008/10/05/displaying-line-numbers-with-nstextview/
[ingist]: https://itunes.apple.com/us/app/ingist/id680035328?mt=12
[gitflow]: http://nvie.com/git-model/
[uksyntax]: https://github.com/uliwitness/UKSyntaxColoredTextDocument
[noodleline]: http://www.noodlesoft.com/blog/2008/10/05/displaying-line-numbers-with-nstextview/
[ingist]: https://itunes.apple.com/us/app/ingist/id680035328?mt=12
[gitflow]: http://nvie.com/git-model/

0 comments on commit 8fee123

Please sign in to comment.