| commit | c9834f234d7ac2cfe86e697393f7f4d117199176 | |
| author | Philip Withnall <withnall@endlessm.com> | |
| Mon, 13 Aug 2018 14:35:52 +0000 (13 15:35 +0100) | ||
| committer | Philip Withnall <withnall@endlessm.com> | |
| Mon, 13 Aug 2018 14:35:52 +0000 (13 15:35 +0100) | ||
| tree | c4b94ce4a09550f62d7c476aab066d524cc592ad | treesnapshot (tar.gz zip) |
| parent | 438547641f5d9c65f07254b0948b269e45891ef4 | commitdiff |
| parent | 57962aac85a41f554e14da14906a3ba0bd8f9156 | commitdiff |
Merge remote-tracking branch 'gvdb/master' into update-gvdb
Minor merge conflicts in gvdb-reader.c with the documentation.
Minor merge conflicts in gvdb-reader.c with the documentation.
| gio/gvdb/gvdb-builder.c | diff1 | diff2 | blobhistory |
| gio/gvdb/gvdb-reader.c | diff1 | diff2 | blobhistory |
| gio/gvdb/gvdb-reader.h | diff1 | diff2 | blobhistory |
| gio/gvdb/gvdb.doap | diff1 | diff2 | blobhistory |