| commit | 3a5b58cf197453531e99eaba43cddaf63020eb9b | [log] [tgz] |
|---|---|---|
| author | Jean-Francois Thibert <jfthibert@google.com> | Tue Jun 10 09:52:14 2014 -0400 |
| committer | Jean-Francois Thibert <jfthibert@google.com> | Tue Jun 10 10:31:36 2014 -0400 |
| tree | b472be190cd79c5c4194b94fc7ccdfd6a349edda | |
| parent | 34cdb3d83ed57c0924e306c12c0807a5f294542b [diff] | |
| parent | 9b42c87dac41a36b1d32da9210534eb00c0b0c1d [diff] |
Merge branch 'drops' into master Conflicts: src/server/dial_server.c src/server/main.c src/server/quick_ssdp.c Change-Id: I0e1e4bedf8206dcf422564b465864e3de2570567