Joshua Sherman dfe51a3864 Merge remote-tracking branch 'upstream/master' ... Conflicts: syntax/php.template syntax/php.vim Attempted to merge in upstream changes as they claimed to have fixed an issue that broke spell checking presumably introduced by my branch. I was unable to get spell checking working with the syntax file that was part of my original fork: 36ccde5296 Because of this I left my script as is in favor of highlighting just the @attribute part of the docblock and not highlighting the entire comment string which appeared visually awkward to me. Ideally I'd love to get spell checking working in all the places that it should be working but that seems to be a bigger issue all together. Also added support for the @usage attribute as it's something that is fairly common albeit not standard docblocking		2014-01-14 00:23:14 -05:00
..
php.template	Merge remote-tracking branch 'upstream/master'	2014-01-14 00:23:14 -05:00
php.vim	Merge remote-tracking branch 'upstream/master'	2014-01-14 00:23:14 -05:00