commit 9a7c95234cb3b24df9d99f9bd62c7af4a78beeff
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Thu Nov 12 11:29:24 2015 -0500

    3.18.4

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

commit 91a91b69b961ba32896ade91894619804be4337b
Author: Colomban Wendling <ban@herbesfolles.org>
Date:   Sat Oct 31 23:02:36 2015 +0100

    cssnode: Fix style updating when the CSS node ID changes

    Since 4ebb5781eaf332da3f8ce5ffb5ecc8668a56f118 ID has a specific
    value,
    while it used to be the same as NAME.  Thus, explicitly list ID as a
    radical change just like NAME.

    https://bugzilla.gnome.org/show_bug.cgi?id=757397

 gtk/gtkcssnode.c       | 2 +-
 gtk/gtkcsswidgetnode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 511bd4fee7fa0c2abf394681713c6bce93b99b02
Author: Sébastien Wilmet <swilmet@gnome.org>
Date:   Thu Nov 12 17:23:16 2015 +0100

    Revert "inspector: remove gtk_text_buffer_get_iter_at_line_index()
    workaround"

    This reverts commit 1536710dbac58f0d46a6c308370e1e3864bf42e0.

    Because of the revert at
    commit 0dc66f5125196ee10c7e851b75f16e9f5669eb49.

 gtk/inspector/css-editor.c | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

commit 0dc66f5125196ee10c7e851b75f16e9f5669eb49
Author: Matthias Clasen <mclasen@redhat.com>
Date:   Thu Nov 12 10:34:48 2015 -0500

    Revert "textbuffer: nicer get_iter functions"

    This reverts commit cf51c4f6dbd91dae1878a0cb0d08b24c67e15232.

    This change broke binding api.

 gtk/gtktextbuffer.c        |  95 ++++++++--------------------------
 gtk/gtktextbuffer.h        |  34 ++++++-------
 testsuite/gtk/textbuffer.c | 123
 ---------------------------------------------
 3 files changed, 37 insertions(+), 215 deletions(-)

commit a875a848468d6df12f63e7c0604615ed60f102eb
Author: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>
Date:   Thu Nov 12 23:17:28 2015 +0800

    update zh_CN translation

 po/zh_CN.po | 5444
 ++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 3513 insertions(+), 1931 deletions(-)

commit e0f951a76a75b798db6daa98cb93e3de34bb0ad9
Author: Ignacio Casal Quinteiro <icq@gnome.org>
Date:   Thu Nov 12 15:59:43 2015 +0100

    win32: chain up on display dispose

 gdk/win32/gdkdisplay-win32.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)