diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2012-07-14 14:42:02 -0600 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2012-07-14 14:42:02 -0600 |
commit | bd244b121a20f17e7e3151f601e61133dbf73377 (patch) | |
tree | 14a0995bf89c7fc486380e8976cb593b20f19258 /Makefile.sources | |
parent | 2e98764cdfabfc41c03bbfdd9ad8279f0281f1dc (diff) | |
parent | 6ab102c3b10b2c5934497b06978e25c656c6e19a (diff) | |
download | netsurf-bd244b121a20f17e7e3151f601e61133dbf73377.tar.gz netsurf-bd244b121a20f17e7e3151f601e61133dbf73377.tar.bz2 |
Merge branch 'vince/forms-fixed'
Conflicts:
Makefile.sources
render/box_construct.c
render/html.c
render/html_internal.h
Merge Daniel Silverstones forms branch
Diffstat (limited to 'Makefile.sources')
-rw-r--r-- | Makefile.sources | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.sources b/Makefile.sources index 9a4d8c59a..608381934 100644 --- a/Makefile.sources +++ b/Makefile.sources @@ -13,7 +13,7 @@ S_CSS := css.c dump.c internal.c select.c utils.c S_RENDER := box.c box_construct.c box_normalise.c \ font.c form.c \ - html.c html_script.c html_interaction.c html_redraw.c \ + html.c html_script.c html_interaction.c html_redraw.c html_forms.c \ imagemap.c layout.c list.c search.c table.c \ textinput.c textplain.c |