Merge 2.62.0 into tizen
authorAdrian Szyndela <adrian.s@samsung.com>
Thu, 23 Jan 2020 11:37:31 +0000 (12:37 +0100)
committerAdrian Szyndela <adrian.s@samsung.com>
Fri, 31 Jan 2020 10:48:42 +0000 (11:48 +0100)
Change-Id: I3be9de1543394062c1d170b39da05ac305dca971

23 files changed:
1  2 
NEWS
docs/reference/glib/glib-sections.txt
docs/reference/glib/gvariant-text.xml
gio/gdbusaddress.c
gio/gdbusconnection.c
gio/gdbusmessage.c
gio/gdbusnamewatching.c
gio/gdbusnamewatching.h
gio/gdbusobjectmanagerclient.c
gio/gdbusprivate.c
gio/gdbusproxy.c
gio/gdbusutils.c
gio/gioenums.h
gio/meson.build
glib/glib-autocleanups.h
glib/glib-private.h
glib/gmessages.h
glib/gtestutils.c
glib/gtestutils.h
glib/gvariant-parser.c
glib/gvariant.c
glib/gvarianttypeinfo.c
glib/meson.build

diff --cc NEWS
Simple merge
Simple merge
Simple merge
Simple merge
index dc5df08,f1f0921..aa9b07c
mode 100755,100644..100755
  #include "giostream.h"
  #include "gasyncresult.h"
  #include "gtask.h"
+ #include "gmarshal-internal.h"
  
  #ifdef G_OS_UNIX
 +#include "gkdbus.h"
  #include "gunixconnection.h"
  #include "gunixfdmessage.h"
  #endif
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gio/gioenums.h
Simple merge
diff --cc gio/meson.build
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc glib/gvariant.c
Simple merge
Simple merge
Simple merge