Commit Graph

392 Commits

Author SHA1 Message Date
Bjorn Winckler 5428a4b684 Merge branch 'vim'
Conflicts:
	src/auto/configure
2013-11-23 10:23:21 +01:00
Bram Moolenaar 99151b7414 Update runtime files. 2013-11-14 05:48:46 +01:00
Bram Moolenaar 6c3976769a Updated runtime files. 2013-11-09 03:41:58 +01:00
Bram Moolenaar 2a39887e22 Update runtime files. 2013-11-03 21:14:31 +01:00
Bjorn Winckler 655e0a80b3 Merge branch 'vim' 2013-10-06 21:11:56 +02:00
Bram Moolenaar 3c85f00311 Runtime file updates. 2013-10-06 14:22:40 +02:00
Bjorn Winckler ce0bd683e3 Merge branch 'vim'
Conflicts:
	src/auto/configure
2013-10-06 13:23:28 +02:00
Bram Moolenaar 1d8eccce84 Fix problem with 'iskeyword' in CSS syntax. 2013-09-24 23:30:38 +02:00
Bjorn Winckler 3f6a4d7b84 Merge branch 'vim' 2013-09-23 12:19:49 +02:00
Bram Moolenaar c2ec86c1f8 Update runtime files. Add support for J. 2013-09-22 14:42:24 +02:00
Bjorn Winckler 90a2abe6f7 Merge branch 'vim' 2013-09-16 09:19:14 +02:00
Bram Moolenaar 9416bca31b Updated runtime files. 2013-09-05 22:13:31 +02:00
Bjorn Winckler 5d200bad14 Merge branch 'vim'
Conflicts:
	src/auto/configure
2013-08-10 15:58:51 +02:00
Bram Moolenaar d2d246e2bb Update runtime files. 2013-08-03 18:35:36 +02:00
Bjorn Winckler 9fc84fb9b0 Merge branch 'vim'
Conflicts:
	src/auto/configure
2013-07-28 21:34:18 +02:00
Bram Moolenaar f36af01f77 Updated runtime files. 2013-07-28 16:02:18 +02:00
Bram Moolenaar de295a645a Updated runtime files. 2013-07-24 19:53:36 +02:00
Bjorn Winckler 4537063e73 Merge branch 'vim' 2013-07-09 19:48:32 +02:00
Bram Moolenaar b7efedaf35 Updated runtime files. Fix NL translations. 2013-07-09 15:44:17 +02:00
Bjorn Winckler 7aacbcd19f Merge branch 'vim' 2013-07-06 19:02:27 +02:00
Bram Moolenaar 9592d73105 A few updated runtime files. 2013-07-05 21:01:22 +02:00
Bjorn Winckler e02ab36a78 Merge branch 'vim' 2013-06-27 21:40:25 +02:00
Bram Moolenaar 564fb602a1 Updated runtime files. New version of TOhtml plugin. 2013-06-26 13:28:14 +02:00
Bram Moolenaar db8bfcbe14 Update runtime files. 2013-06-24 22:22:18 +02:00
Bjorn Winckler 6fc791c663 Merge branch 'vim' 2013-06-17 17:29:40 +02:00
Bram Moolenaar 38a2d6a2ae Updated runtime files. 2013-06-15 21:39:51 +02:00
Bjorn Winckler f72d696060 Merge branch 'vim'
Conflicts:
	runtime/doc/gui.txt
2013-06-13 21:13:21 +03:00
Bram Moolenaar a2e15c3767 Update runtime files. 2013-06-12 21:29:15 +02:00
Bjorn Winckler 3e20bda243 Merge branch 'vim'
Conflicts:
	src/auto/configure
	src/configure.in
	src/vim.h
2013-06-08 15:36:15 +02:00
Bram Moolenaar 2bee54ed30 Updated runtime files. 2013-06-06 21:36:40 +02:00
Bram Moolenaar e0086714bc Updated runtime files and translations. 2013-06-01 14:50:56 +02:00
Bjorn Winckler 9a7a0eefd4 Merge branch 'vim'
Conflicts:
	src/feature.h
2013-05-24 15:42:40 +02:00
Bram Moolenaar 6cdc3c1d50 Updated runtime files, language files and translations. 2013-05-21 21:01:10 +02:00
Bjorn Winckler 11b2e90995 Merge branch 'vim'
Conflicts:
	runtime/syntax/vim.vim
	src/auto/configure
	src/eval.c
	src/if_ruby.c
	src/misc1.c
	src/normal.c
2013-05-18 16:18:54 +02:00
Bram Moolenaar 78e9d3f7e2 Update runtime files. 2013-05-17 18:14:19 +02:00
Bram Moolenaar f257d3eb7f Updated runtime files. 2013-05-06 05:58:55 +02:00
Bram Moolenaar 8c23801004 Updated runtime files. 2013-04-24 18:51:19 +02:00
Bram Moolenaar 9c5ad6b26d Updated runtime files. 2013-04-12 15:09:51 +02:00
Bram Moolenaar 0a7bf116c1 Move redif syntax file to the right directory.
Disable recognizing .rdf as a redif file.
2013-04-06 17:26:26 +02:00
Bram Moolenaar 42f4ed080b Updated runtime files. 2013-04-05 22:26:15 +02:00
Bram Moolenaar 4c0f497180 Update runtime files. 2013-03-19 11:35:58 +01:00
Bram Moolenaar 90cb083c4c Updated runtime files. 2013-03-07 13:20:54 +01:00
Bram Moolenaar dc0db92ab0 Update runtime files. 2013-02-20 21:26:00 +01:00
Bram Moolenaar 4900a1fbf8 Update runtime files.
Add missing test files.
2013-02-13 16:15:55 +01:00
Bjorn Winckler 1ba220ad3d Merge branch 'vim'
Conflicts:
	runtime/doc/tags
	src/gui.c
	src/option.c
2013-02-07 20:09:24 +01:00
Bram Moolenaar a4335d2a12 Updated runtime files. 2013-02-06 17:34:04 +01:00
Bram Moolenaar 8888c8cce4 Update runtime files. 2013-01-30 14:18:00 +01:00
Bjorn Winckler caebe7d074 Merge branch 'vim'
Conflicts:
	runtime/doc/various.txt
2012-12-12 16:10:23 +01:00
Bram Moolenaar 6886afbcc0 Updated runtime files. 2012-11-28 18:21:11 +01:00
Bram Moolenaar cd5a832eb6 Updated runtime files. 2012-11-15 21:28:22 +01:00