From: Philippe Coval <philippe.coval@eurogiciel.fr>
Date: Fri, 19 Jul 2013 13:00:32 +0000 (+0200)
Subject: changes: Bug-Tizen: TZPC-3317 (... remove the fav apps icon ...)
X-Git-Tag: accepted/tizen/mobile/20150903.233546~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e7e0776a3e8bb7609f36d9866ecae1a1a8973a6;p=platform%2Fupstream%2Fglib.git

changes: Bug-Tizen: TZPC-3317 (... remove the fav apps icon ...)

Conflicts:
	packaging/glib2.changes
---

diff --git a/packaging/glib2.changes b/packaging/glib2.changes
index 949012b..b37fe75 100644
--- a/packaging/glib2.changes
+++ b/packaging/glib2.changes
@@ -1,5 +1,14 @@
 * Tue Aug 13 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.095512@84a55be
 - Remove empty docs package
+* Fri Jul 19 2013 Philippe Coval <philippe.coval@eurogiciel.fr> accepted/tizen/20130710.220535@5c863cc
+- gdesktopappinfo: Allow getting the desktop ID from the filename
+  Bug-Tizen: TZPC-3317 (... remove the fav apps icon ...)
+  Origin: upstream, https://git.gnome.org/browse/glib/commit/?id=c0af442909e1304b799a4b6c145f8444c752e3da
+- resetting manifest requested domain to floor
+- GSocks5Proxy: don't crash if parsing negotiation reply fails
+  Applied-upstream: 2.36.2, commit:0ba982e05
+  Bug: https://bugzilla.gnome.org/show_bug.cgi?id=699493
+  Bug-Tizen: TZPC-34 (Empathy / Telepathy - Proxy support)
 
 * Sat Apr 27 2013 Anas Nashif <anas.nashif@intel.com> 2.36.1@1b0d9ca
 - Update to 2.36.1