diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2017-02-19 11:39:47 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2017-02-19 11:39:47 +0000 |
| commit | ae45b18b459fa4f490501a93459e49f1f1038073 (patch) | |
| tree | f0d8a3356a74c0a448f6d8ad5f4e4b22fc3c384c /frontends/gtk/res/netsurf.gresource.xml | |
| parent | 67b22a811128f5a0635430151a73442d1f100735 (diff) | |
| parent | 0f69965805dda51cc7b6ea8404226d5f75a3b533 (diff) | |
| download | netsurf-ae45b18b459fa4f490501a93459e49f1f1038073.tar.gz netsurf-ae45b18b459fa4f490501a93459e49f1f1038073.tar.bz2 | |
Merge branch 'vince/localhist-corewin'
Diffstat (limited to 'frontends/gtk/res/netsurf.gresource.xml')
| -rw-r--r-- | frontends/gtk/res/netsurf.gresource.xml | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml index c7626b053..5bae777f3 100644 --- a/frontends/gtk/res/netsurf.gresource.xml +++ b/frontends/gtk/res/netsurf.gresource.xml @@ -2,30 +2,32 @@ <gresources> <gresource prefix="/org/netsurf"> <file>cookies.gtk2.ui</file> - <file>history.gtk3.ui</file> - <file>netsurf.gtk2.ui</file> - <file>password.gtk3.ui</file> - <file>toolbar.gtk2.ui</file> + <file>globalhistory.gtk3.ui</file> + <file>localhistory.gtk3.ui</file> + <file>netsurf.gtk2.ui</file> + <file>password.gtk3.ui</file> + <file>toolbar.gtk2.ui</file> <file>warning.gtk3.ui</file> - <file>cookies.gtk3.ui</file> - <file>hotlist.gtk2.ui</file> - <file>netsurf.gtk3.ui</file> - <file>ssl.gtk2.ui</file> + <file>cookies.gtk3.ui</file> + <file>hotlist.gtk2.ui</file> + <file>netsurf.gtk3.ui</file> + <file>ssl.gtk2.ui</file> <file>toolbar.gtk3.ui</file> - <file>downloads.gtk2.ui</file> - <file>hotlist.gtk3.ui</file> - <file>options.gtk2.ui</file> - <file>ssl.gtk3.ui</file> + <file>downloads.gtk2.ui</file> + <file>hotlist.gtk3.ui</file> + <file>options.gtk2.ui</file> + <file>ssl.gtk3.ui</file> <file>viewdata.gtk2.ui</file> - <file>downloads.gtk3.ui</file> - <file>login.gtk2.ui</file> - <file>options.gtk3.ui</file> - <file>tabcontents.gtk2.ui</file> + <file>downloads.gtk3.ui</file> + <file>login.gtk2.ui</file> + <file>options.gtk3.ui</file> + <file>tabcontents.gtk2.ui</file> <file>viewdata.gtk3.ui</file> - <file>history.gtk2.ui</file> - <file>login.gtk3.ui</file> - <file>password.gtk2.ui</file> - <file>tabcontents.gtk3.ui</file> + <file>localhistory.gtk2.ui</file> + <file>globalhistory.gtk2.ui</file> + <file>login.gtk3.ui</file> + <file>password.gtk2.ui</file> + <file>tabcontents.gtk3.ui</file> <file>warning.gtk2.ui</file> <file preprocess="to-pixdata">favicon.png</file> <file preprocess="to-pixdata">netsurf.xpm</file> |