From e1970353d65e086cfa5ed7d0b959079b8d94515c Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Nov 07 2017 15:07:05 +0000
Subject: Merge branch 'f26' into f27


---

diff --git a/.gitignore b/.gitignore
index d07adae..fb42d43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,4 @@
 /vim-8.0-1241.tar.bz2
 /vim-8.0-1257.tar.bz2
 /vim-8.0-1272.tar.bz2
+/vim-8.0-1274.tar.bz2
diff --git a/sources b/sources
index a0caa9d..a058c74 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1272.tar.bz2) = bbeb9562972d9c5989633015b35d03bc3a5f632a2735d0658b522b0df11a68ea837bc1136efa951c47a7d3bbed70d7fe6c65be1c42d3c2b3a36ea3602313aac0
+SHA512 (vim-8.0-1274.tar.bz2) = 52f7d795c28f419a25a957d7a63fb85266f3fae8efd31ad5771c961c5f9be269f3af9b34067150616da63b819773838298de82e981078d42d4a23dd3d8fab33d
diff --git a/vim.spec b/vim.spec
index bfe5e6e..f2148f8 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1272
+%define patchlevel 1274
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -771,6 +771,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Nov 07 2017 Karsten Hopp <karsten@redhat.com> 8.0.1274-1
+- patchlevel 1274
+
 * Mon Nov 06 2017 Karsten Hopp <karsten@redhat.com> 8.0.1272-1
 - patchlevel 1272