summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-10-14 13:48:13 (GMT)
committerReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-04-12 02:08:01 (GMT)
commit68450657be7c9e3688a7b497adc30e286642ea01 (patch)
treede0c5a3c6f891158a4bf52061a01ca96ffb2c7e3
parent3f9496ea635d29f1d0ba5ad0bb74135d50225a1e (diff)
downloadglib-68450657be7c9e3688a7b497adc30e286642ea01.tar.gz
glib-68450657be7c9e3688a7b497adc30e286642ea01.tar.xz
Cosmetics
-rw-r--r--NEWS5
1 files changed, 5 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e3dcd09..18a6236 100644
--- a/NEWS
+++ b/NEWS
@@ -33,7 +33,12 @@ Overview of changes from GLib 2.32.0 to 2.32.1
Swedish
Telugu
+<<<<<<< HEAD
Overview of changes from GLib 2.31.22 to 2.32.0
+=======
+
+Overview of changes from GLib 2.29.92 to 2.30.0
+>>>>>>> Cosmetics
===============================================
* Bugs fixed: