averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-02-09 20:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,284 Commits 5 Branches 171 Tags
4fe710d0f9d89fd2de0ead8a1a2cde34a72e89bb
Commit Graph

308 Commits

Author SHA1 Message Date
Bjorn Winckler
4fe710d0f9 Merge branch 'vim' 
Conflicts:
	runtime/syntax/vim.vim
 2011-09-22 17:37:28 +02:00
Bram Moolenaar
456ae485bf Updated a few runtime files. 2011-09-21 19:22:10 +02:00
Bjorn Winckler
0df4812a34 Merge branch 'vim' 
Conflicts:
	src/gui.c
 2011-09-15 12:21:16 +02:00
Bram Moolenaar
f7a78fd1d6 Updated runtime files. 2011-09-14 17:55:08 +02:00
Bjorn Winckler
e0f133cb14 Merge branch 'vim' 2011-07-22 19:51:20 +02:00
Bram Moolenaar
1e4ca096eb Updated runtime files. 
Add missing test82 files.
 2011-07-18 19:40:27 +02:00
Bjorn Winckler
f6c0037945 Merge branch 'vim' 
Conflicts:
	src/gui.c
 2011-06-27 12:03:57 +02:00
Bram Moolenaar
c06b3af207 Updated runtime files. 2011-06-19 05:09:16 +02:00
Bjorn Winckler
c60f09b824 Merge branch 'vim' 
Conflicts:
	src/ex_getln.c
	src/gui.c
	src/gui.h
	src/vim.h
 2011-05-30 21:42:28 +02:00
Bram Moolenaar
436044e240 Updated runtime files. 2011-05-19 12:22:51 +02:00
Bram Moolenaar
a93c4e62ab Updated runtime files. 2011-05-10 17:18:44 +02:00
Bjorn Winckler
d0d1d08737 Merge branch 'vim' 
Conflicts:
	src/auto/configure
	src/configure.in
 2011-05-07 16:06:07 +02:00
Bram Moolenaar
e8f41f95a7 Updated runtime files. 2011-04-28 19:02:44 +02:00
Bjorn Winckler
f7f11165e3 Merge branch 'vim' 2011-04-21 11:07:30 +02:00
Bram Moolenaar
ce0253ed24 Updated runtime files. 2011-04-01 18:03:16 +02:00
Bjorn Winckler
557788dc9e Merge branch 'vim' 
Conflicts:
	runtime/menu.vim
 2011-03-22 22:09:37 +01:00
Bram Moolenaar
49d654e23e Updated runtime files. 2011-03-22 14:05:35 +01:00
Bram Moolenaar
163e8a729a Runtime file updates. 2011-02-25 14:42:19 +01:00
Bjorn Winckler
00936cdd77 Merge branch 'vim' 
Conflicts:
	runtime/doc/eval.txt
 2011-01-09 16:16:35 +01:00
Bram Moolenaar
fa35c64041 Updated runtime files. 2011-01-08 16:06:37 +01:00
Bjorn Winckler
34d035c0ac Merge branch 'vim' 
Conflicts:
	runtime/syntax/vim.vim
 2010-12-19 12:18:48 +01:00
Bram Moolenaar
f2c486c416 Update runtime files. 2010-12-10 20:35:50 +01:00
Bjorn Winckler
29697da99f Merge branch 'vim' into merge 
Conflicts:
	src/auto/configure
	src/eval.c
	src/netbeans.c
 2010-12-10 19:13:58 +01:00
Bram Moolenaar
96d70531dd Updated runtime files. 2010-11-16 20:34:40 +01:00
Bjorn Winckler
5c71a17d6c Merge branch 'vim' 
Conflicts:
	src/auto/configure
 2010-11-01 13:39:23 +01:00
Bram Moolenaar
65cb201df3 Updated runtile files. 2010-10-27 18:34:44 +02:00
Bram Moolenaar
679e2d9461 Updated runtime files and translations. 2010-10-20 18:45:33 +02:00
Bjorn Winckler
051dd87d5e Merge branch 'vim' 
Conflicts:
	src/main.c
 2010-10-01 16:55:17 +02:00
Bram Moolenaar
8d49009628 Runtime file updates. 2010-09-30 21:47:56 +02:00
Bram Moolenaar
3a7b73bbe8 Updated runtime files. 2010-09-21 22:34:02 +02:00
Bram Moolenaar
7e9a35b73e Updated runtime files. 2010-09-19 19:01:21 +02:00
Bjorn Winckler
34604f8552 Merge branch 'vim73' into macvim73 
Conflicts:
	src/auto/configure
 2010-08-14 20:55:23 +02:00
Bram Moolenaar
cd6dedcacc Fix for Yaml syntax file. (Nikolai Weibull) 
--HG--
branch : vim73
 2010-08-13 14:58:53 +02:00
Bram Moolenaar
d341131f60 Runtime file updates. 
--HG--
branch : vim73
 2010-08-13 14:38:12 +02:00
Bram Moolenaar
1d86870323 Update to Perl runtime files. (Andy Lester) 
--HG--
branch : vim73
 2010-08-13 12:09:22 +02:00
Bram Moolenaar
fc88796a54 Updates for :TOhtml. (Benjamin Fritz) 
--HG--
branch : vim73
 2010-08-13 11:30:02 +02:00
Bram Moolenaar
f166b809bc Runtime file updates. 
--HG--
branch : vim73
 2010-08-11 23:37:32 +02:00
Bram Moolenaar
05246bf32e Runtime file updates. Fix tar plugin window split. 
--HG--
branch : vim73
 2010-08-10 21:43:35 +02:00
Bram Moolenaar
b6a0fcfb5d Runtime file updates. 
--HG--
branch : vim73
 2010-08-09 22:33:06 +02:00
Bram Moolenaar
c263388a1f Runtime file updates. (Tim Pope) 
--HG--
branch : vim73
 2010-08-09 20:13:35 +02:00
Bjorn Winckler
9787b377fa Merge branch 'vim73' into macvim73 
Conflicts:
	runtime/syntax/vim.vim
	src/screen.c
 2010-08-08 23:13:25 +02:00
Bram Moolenaar
9a96d5dc0c Also support Doxygen in C# files. (Andreas J. Beblik) 
--HG--
branch : vim73
 2010-08-08 15:28:22 +02:00
Bram Moolenaar
e8219a043c Updates for :TOhtml. (Ben Fritz) 
--HG--
branch : vim73
 2010-08-07 15:47:30 +02:00
Bram Moolenaar
bd16010c08 Update for jsp syntax file. 
--HG--
branch : vim73
 2010-08-07 13:46:23 +02:00
Bram Moolenaar
d436e625c9 Updated syntax files. 
--HG--
branch : vim73
 2010-08-05 22:08:47 +02:00
Bram Moolenaar
6b904597ff Improve handling of user settings in :TOhtml. Default to generating CSS. 
(Benjamin Fritz)

--HG--
branch : vim73
 2010-08-05 21:54:00 +02:00
Bram Moolenaar
203a46a890 Updated syntax files. (Charles Campbell) 
--HG--
branch : vim73
 2010-08-04 23:03:17 +02:00
Bjorn Winckler
e9de29bf9e Merge branch 'vim73' into macvim73 2010-08-04 19:23:39 +02:00
Bram Moolenaar
6aca8a785d Add translations in diff syntax. (Jakson A. Aquino) 
--HG--
branch : vim73
 2010-08-04 16:11:50 +02:00
Bram Moolenaar
d8ac2e3d0f Runtime file updates. 
--HG--
branch : vim73
 2010-08-03 23:00:38 +02:00