diff --git a/.gitignore b/.gitignore index d33b138..44db0ab 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ vim-7.2.tar.bz2 /vim-7.4-942.tar.bz2 /vim-7.4-944.tar.bz2 /vim-7.4-945.tar.bz2 +/vim-7.4-947.tar.bz2 diff --git a/README.patches b/README.patches index f35ccc3..b53a79e 100644 --- a/README.patches +++ b/README.patches @@ -1,3 +1,20 @@ +commit 5311c02f25eed8f34e8a80becb98e86264f371c3 +Author: Bram Moolenaar +Date: Tue Dec 1 20:19:26 2015 +0100 + + patch 7.4.947 + Problem: Test_listchars fails with MingW. (Michael Soyka) + Solution: Add the test to the ones that need the fileformat fixed. + (Christian Brabandt) + +commit bbfbaf9741deebb9f1ed790885bd571c4cbce17a +Author: Bram Moolenaar +Date: Tue Dec 1 15:32:56 2015 +0100 + + patch 7.4.946 + Problem: Missing changes in source file. + Solution: Include changes to the eval.c file. + commit 683fa185a4b4ed7595e5942901548b8239ed5cdb Author: Bram Moolenaar Date: Mon Nov 30 21:38:24 2015 +0100 diff --git a/sources b/sources index 5425e64..09ecd28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9fcca99fb3a9f1c90a18a9bb35451c58 vim-7.4-945.tar.bz2 +0092133b781d1ad97c308fe30e4e8636 vim-7.4-947.tar.bz2 diff --git a/vim.spec b/vim.spec index 98175e9..ddde990 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 945 +%define patchlevel 947 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -756,6 +756,9 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Dec 02 2015 Karsten Hopp 7.4.947-1 +- patchlevel 947 + * Tue Dec 01 2015 Karsten Hopp 7.4.945-1 - patchlevel 945