From fb9aa04258d1bf23c868f39a18138fe728ecf924 Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Fri, 19 Nov 2021 11:28:35 +0200
Subject: [PATCH] Bump version, add changelog

---
 ChangeLog.md | 5 +++++
 parsec.cabal | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 7248584b..58e69801 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,8 @@
+### 3.1.15.0
+
+- Add `INLINABLE` pragmas to most overloaded combinators
+- Support recent versions of dependencies
+
 ### 3.1.14.0
 
 - Add `parseFromFile` to `Text.Parsec.Text.Lazy` and `Text.Parsec.Text` (#103, #104).
diff --git a/parsec.cabal b/parsec.cabal
index 73892f98..d5490680 100644
--- a/parsec.cabal
+++ b/parsec.cabal
@@ -1,6 +1,6 @@
 cabal-version:  1.12
 name:           parsec
-version:        3.1.14.1
+version:        3.1.15.0
 
 synopsis:       Monadic parser combinators
 description:    Parsec is designed from scratch as an industrial-strength parser
@@ -20,7 +20,7 @@ description:    Parsec is designed from scratch as an industrial-strength parser
 license:        BSD2
 license-file:   LICENSE
 author:         Daan Leijen <daan@microsoft.com>, Paolo Martini <paolo@nemail.it>, Antoine Latter <aslatter@gmail.com>
-maintainer:     Herbert Valerio Riedel <hvr@gnu.org>
+maintainer:     Oleg Grenrus <oleg.grenrus@iki.fi>, Herbert Valerio Riedel <hvr@gnu.org>
 homepage:       https://github.com/haskell/parsec
 bug-reports:    https://github.com/haskell/parsec/issues
 category:       Parsing