From 7c813a951cab6c8db1b9d67c03f3d9a9cf4b4dee Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <Jochen@herr-schmitt.de>
Date: Feb 02 2015 21:47:26 +0000
Subject: New upstream release with support for lua-5.3


---

diff --git a/.gitignore b/.gitignore
index acb114c..1ee99f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,8 @@ highlight-3.1-beta2.tar.bz2
 /highlight-3.16.tar.bz2
 /highlight-3.16.1.tar.bz2
 /highlight-3.18.tar.bz2
+<<<<<<< HEAD
+=======
+/highlight-3.20.tar.bz2
+/highlight-3.21.tar.bz2
+>>>>>>> ba73825... New upstream release with support for lua-5.3
diff --git a/highlight.spec b/highlight.spec
index 4535de2..24d76b2 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -2,8 +2,8 @@ Name:           highlight
 
 Summary:        Universal source code to formatted text converter
 
-Version:        3.18
-Release:        4%{?dist}
+Version:        3.21
+Release:        1%{?dist}
 
 Group:          Development/Tools
 License:        GPLv3
@@ -78,6 +78,15 @@ desktop-file-install \
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Mon Feb  2 2015 Jochen Schmitt <Jochen herr-schmitt de> - 3.21-1
+- New upstream release with support for lua-5.3
+
+* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 3.20-2
+- Rebuild for boost 1.57.0
+
+* Wed Jan 21 2015 Jochen Schmitt <Jochen herr-schmitt de> - 3.20-1
+- New upstream release
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.18-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 6b02f45..c350d0a 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-085d7639a7e05a0d41923a889dc801c9  highlight-3.18.tar.bz2
+ 22cd432e84f0b29aed172435af31aed  highlight-3.21.tar.bz2
+>