From 05c23573020bd6f173553d1176b367aa13890324 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Oct 30 2017 09:54:39 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 6841619..3f7ea22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,3 +131,4 @@
 /vim-8.0-1213.tar.bz2
 /vim-8.0-1216.tar.bz2
 /vim-8.0-1226.tar.bz2
+/vim-8.0-1238.tar.bz2
diff --git a/sources b/sources
index 8e22741..1c1ecab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1226.tar.bz2) = d0e4798bcfd876c9388d79d7828ed9f18f9bf4c22f039c3970c1f337db11575a6d115f64c84eb40ccb979d08e66e12d0c85169b79c098b70b1875d8574f3f112
+SHA512 (vim-8.0-1238.tar.bz2) = 68927095dc369185a962c4a9bab3bcbfb443d5f1581837bd38e78e0edf754165dc853c8d20fbf808af66abfb492ca1ae9be07545135c749494a1ee18b4afc7bb
diff --git a/vim.spec b/vim.spec
index d2a302b..32fd0f8 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1226
+%define patchlevel 1238
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -773,6 +773,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Oct 30 2017 Karsten Hopp <karsten@redhat.com> 8.0.1238-1
+- patchlevel 1238
+
 * Fri Oct 27 2017 Karsten Hopp <karsten@redhat.com> 8.0.1226-1
 - patchlevel 1226