diff options
| author | Sergey Tikhomirov <tikhomirov84@gmail.com> | 2013-06-29 10:10:50 +0300 |
|---|---|---|
| committer | Sergey Tikhomirov <tikhomirov84@gmail.com> | 2013-06-29 10:10:50 +0300 |
| commit | 22330d3dcf5e92bf2bac583b6fc0a5f81c3ff4ad (patch) | |
| tree | bea28eaf1dbf3c3c2d147dc23dc8c1be7e6b77a0 /ftdetect | |
| parent | c7775b0c391de877d2036ab3f969129e5d92d7bf (diff) | |
| parent | 4def223390c0504279f18904717b0dc51f6552aa (diff) | |
| download | vim-glsl-22330d3dcf5e92bf2bac583b6fc0a5f81c3ff4ad.tar.gz vim-glsl-22330d3dcf5e92bf2bac583b6fc0a5f81c3ff4ad.zip | |
Merge github.com:rkaup/vim-glsl
Conflicts:
ftdetect/glsl.vim
syntax/glsl.vim
Diffstat (limited to 'ftdetect')
| -rw-r--r-- | ftdetect/glsl.vim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ftdetect/glsl.vim b/ftdetect/glsl.vim index 4b4e4da..31ca24c 100644 --- a/ftdetect/glsl.vim +++ b/ftdetect/glsl.vim @@ -3,6 +3,6 @@ " Maintainer: Sergey Tikhomirov <me@stikhomirov.com> " Last Change: 2012 July 10 -autocmd BufNewFile,BufRead *.geom,*.vert,*.frag,*.gsh,*.vsh,*.fsh set filetype=glsl +autocmd BufNewFile,BufRead *.glsl,*.geom,*.vert,*.frag,*.gsh,*.vsh,*.fsh set filetype=glsl " vim:set sw=2: |