From ad8986b622631232324fc7a100fb726a297f22f3 Mon Sep 17 00:00:00 2001
From: "Steven G. Johnson" <stevenj@alum.mit.edu>
Date: Wed, 8 Jul 2020 21:18:09 -0400
Subject: [PATCH] meep 1.15 bump

---
 NEWS.md      | 7 ++++++-
 configure.ac | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 30354f3f5..1b41ff7ba 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,9 +1,14 @@
 # Meep Release Notes
 
-## Meep 1.15.0-alpha
+## Meep 1.15.0
 
 * Minimum-lengthscale filters for adjoint optimization (#1205).
 
+* Python API documentation in docstrings (#1240).
+
+* `MaterialGrid` material type in Python to interpolate an array of material
+  values as the "material" of an object, especially for topology optimization (#1242).
+
 * `merge_subgroup_data` Python function for coordinating parallel
   computations (#1192).
 
diff --git a/configure.ac b/configure.ac
index a31a7d01d..7db1c4a43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(meep, 1.15.0-alpha)
+AC_INIT(meep, 1.15.0)
 AC_CONFIG_SRCDIR(src/step.cpp)
 
 # Shared-library version number; indicates api compatibility, and is