diff options
author | Vincent Sanders <vince@kyllikki.org> | 2016-12-28 16:14:19 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2016-12-28 16:14:19 +0000 |
commit | 96e073a29777bbe927f0bc7187f7032d3f51e68b (patch) | |
tree | a74404287ae531793095126a3499f2d4d34c98fe /frontends/riscos/url_protocol.h | |
parent | 770c277ccc182f504be0a316390d59c05a59e041 (diff) | |
parent | af6139bcb5845d4cdbc852b113ac8fabcee29097 (diff) | |
download | netsurf-96e073a29777bbe927f0bc7187f7032d3f51e68b.tar.gz netsurf-96e073a29777bbe927f0bc7187f7032d3f51e68b.tar.bz2 |
Merge branch 'vince/ro-corewindow'
Conflicts:
frontends/riscos/sslcert.h
Diffstat (limited to 'frontends/riscos/url_protocol.h')
0 files changed, 0 insertions, 0 deletions