Merge branch 'feature/upstream' into develop

1 files changed, 58 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8b160d0..5a15174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,63 @@
+commit cacc8bd5415d978f2eb64f215e4be696290c6edc
+Author: Jens Georg <mail@jensge.org>
+Date:   Mon May 7 19:37:12 2018 +0200
+
+    Prepare 0.28.3
+
+M	NEWS
+M	configure.ac
+M	meson.build
+
+commit 50a532560e1627cae66d75036faab55e3247926b
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun May 6 18:58:26 2018 +0200
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit 93d14085fc7deb433bc018e3a9927c1eb252a450
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun May 6 15:11:31 2018 +0200
+
+    Fix lined tags
+
+    Fix regression introduced by a5ba963889c733d6ac80dad9a09058d0a214eb94
+
+M	src/CheckerboardLayout.vala
+
+commit 828981065e81d04b8160e131ca2c6c8ef91dd2fe
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Apr 29 11:17:19 2018 +0200
+
+    checkerboard: Translate coordinates while drawing
+
+    This prevents that we exceed the translation matrix limits in pixman,
+    the root cause for the Out of memory errors seen on HiDPI displays
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=786702
+
+M	src/CheckerboardLayout.vala
+
+commit 776da8bf0c62d016273e1711e8874a2d7bef09d9
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Apr 14 18:19:32 2018 +0200
+
+    Fix spacing for flagged button
+
+M	src/SearchFilter.vala
+
+commit 77b572462178a1f85633d315e0da69ab51b58f79
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Apr 13 19:29:29 2018 +0200
+
+    Fix spacing in search toolbar
+
+M	src/SearchFilter.vala
+
 commit 4125c3461149ddec7fb58f58390a5c052eb7f1fc
 Author: Jens Georg <mail@jensge.org>
-Date:   Mon Apr 9 20:26:42 2018 +0200
+Date:	Mon Apr 9 20:26:42 2018 +0200
 
     Prepare 0.28.2