diff options
author | Yang Gao <yangg@google.com> | 2015-02-18 23:01:25 -0800 |
---|---|---|
committer | Yang Gao <yangg@google.com> | 2015-02-18 23:01:25 -0800 |
commit | c09c2f4f0425591c533a98d7b3761ee562928450 (patch) | |
tree | f12f0d1d4ec9fb6754a3deec2bd1ea4ada626a73 /src/core/surface/client.c | |
parent | 0d1e2f2ad974b87e6d87a7bf49aec4dd94b25c91 (diff) | |
parent | 26fd5a4aedfc0175db391b14d78cff57a6910503 (diff) |
Merge remote-tracking branch 'upstream/master' into roots
Diffstat (limited to 'src/core/surface/client.c')
0 files changed, 0 insertions, 0 deletions