projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ce04dc 23d8cc5)
Merge branch 'upstream' of ssh://review.tizen.org:29418/platform/upstream/glib into... 69/68869/1 upstream/2.48.0
authorDongHun Kwak <dh0128.kwak@samsung.com>
Tue, 10 May 2016 06:22:43 +0000 (15:22 +0900)
committerDongHun Kwak <dh0128.kwak@samsung.com>
Tue, 10 May 2016 06:59:13 +0000 (15:59 +0900)
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Conflicts:
gio/inotify/ginotifydirectorymonitor.c
gio/tests/.gitignore
glib/tests/.gitignore

Change-Id: If6fc8d87e436f1c57686a4b39b42804136a940c3


Trivial merge
Domain: System / Base;