projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
86afe73
b2e0437
)
Merge 2.62.0 into tizen
author
Adrian Szyndela
<adrian.s@samsung.com>
Thu, 23 Jan 2020 11:37:31 +0000
(12:37 +0100)
committer
Adrian 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
patch
|
diff1
|
diff2
|
blob
|
history
docs/reference/glib/glib-sections.txt
patch
|
diff1
|
diff2
|
blob
|
history
docs/reference/glib/gvariant-text.xml
patch
|
diff1
|
diff2
|
blob
|
history
gio/gdbusaddress.c
patch
|
diff1
|
diff2
|
blob
|
history
gio/gdbusconnection.c
patch
|
diff1
|
diff2
|
blob
|
history
gio/gdbusmessage.c
patch
|
diff1
|
diff2
|
blob
|
history
gio/gdbusnamewatching.c
patch
|
diff1
|
diff2
|
blob
|
history
gio/gdbusnamewatching.h
patch
|
diff1
|
diff2
|
blob
|
history
gio/gdbusobjectmanagerclient.c
patch
|
diff1
|
diff2
|
blob
|
history
gio/gdbusprivate.c
patch
|
diff1
|
diff2
|
blob
|
history
gio/gdbusproxy.c
patch
|
diff1
|
diff2
|
blob
|
history
gio/gdbusutils.c
patch
|
diff1
|
diff2
|
blob
|
history
gio/gioenums.h
patch
|
diff1
|
diff2
|
blob
|
history
gio/meson.build
patch
|
diff1
|
diff2
|
blob
|
history
glib/glib-autocleanups.h
patch
|
diff1
|
diff2
|
blob
|
history
glib/glib-private.h
patch
|
diff1
|
diff2
|
blob
|
history
glib/gmessages.h
patch
|
diff1
|
diff2
|
blob
|
history
glib/gtestutils.c
patch
|
diff1
|
diff2
|
blob
|
history
glib/gtestutils.h
patch
|
diff1
|
diff2
|
blob
|
history
glib/gvariant-parser.c
patch
|
diff1
|
diff2
|
blob
|
history
glib/gvariant.c
patch
|
diff1
|
diff2
|
blob
|
history
glib/gvarianttypeinfo.c
patch
|
diff1
|
diff2
|
blob
|
history
glib/meson.build
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
NEWS
Simple merge
diff --cc
docs/reference/glib/glib-sections.txt
Simple merge
diff --cc
docs/reference/glib/gvariant-text.xml
Simple merge
diff --cc
gio/gdbusaddress.c
Simple merge
diff --cc
gio/gdbusconnection.c
index
dc5df08
,
f1f0921
..
aa9b07c
mode 100755,100644..100755
---
1
/
gio/gdbusconnection.c
---
2
/
gio/gdbusconnection.c
+++ b/
gio/gdbusconnection.c
@@@
-111,9
-111,9
+111,10
@@@
#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
diff --cc
gio/gdbusmessage.c
Simple merge
diff --cc
gio/gdbusnamewatching.c
index
b4a9d46
,
3a97c50
..
7ca294d
mode 100755,100644..100755
---
1
/
gio/gdbusnamewatching.c
---
2
/
gio/gdbusnamewatching.c
+++ b/
gio/gdbusnamewatching.c
diff --cc
gio/gdbusnamewatching.h
Simple merge
diff --cc
gio/gdbusobjectmanagerclient.c
Simple merge
diff --cc
gio/gdbusprivate.c
Simple merge
diff --cc
gio/gdbusproxy.c
Simple merge
diff --cc
gio/gdbusutils.c
Simple merge
diff --cc
gio/gioenums.h
Simple merge
diff --cc
gio/meson.build
Simple merge
diff --cc
glib/glib-autocleanups.h
Simple merge
diff --cc
glib/glib-private.h
Simple merge
diff --cc
glib/gmessages.h
Simple merge
diff --cc
glib/gtestutils.c
Simple merge
diff --cc
glib/gtestutils.h
Simple merge
diff --cc
glib/gvariant-parser.c
Simple merge
diff --cc
glib/gvariant.c
Simple merge
diff --cc
glib/gvarianttypeinfo.c
Simple merge
diff --cc
glib/meson.build
Simple merge