Skip to content
This repository has been archived by the owner on Jan 22, 2022. It is now read-only.

Commit

Permalink
Merge pull request #4 from ubports/xenial
Browse files Browse the repository at this point in the history
re base from current xenial
  • Loading branch information
kugiigi authored Nov 30, 2020
2 parents 80dfadc + e550a08 commit a9151e1
Show file tree
Hide file tree
Showing 138 changed files with 20,095 additions and 11,178 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ add_subdirectory(po)

add_subdirectory(doc)

install(FILES morph-browser.png screenshot.png
DESTINATION ${CMAKE_INSTALL_DATADIR}/morph-browser)

install(FILES morph-browser.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/morph-browser)
install(FILES morph-browser-splash.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/morph-browser)
add_subdirectory(click-hooks)
1 change: 1 addition & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ webbrowser-app is a lightweight web browser tailored for Ubuntu,
based on the Oxide web engine and using the Ubuntu UI components.
It requires Qt 5.5 to build and run.

Morph Icon is based on Origami Licensed CC-by Creative Mania from the Noun Project

= Building =

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Lightweight web browser tailored for Ubuntu,
based on the Qt WebEngine and using the Ubuntu UI components.
It requires Qt 5.9 to build and run.

Morph Icon is based on Origami Licensed CC-by Creative Mania from the Noun Project

= Building =

Expand Down
2 changes: 1 addition & 1 deletion debian/morph-browser.install
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ usr/bin/morph-browser
usr/share/morph-browser/*.qml
usr/share/morph-browser/qmldir
usr/share/morph-browser/*.js
usr/share/morph-browser/*.png
usr/share/morph-browser/*.svg
usr/share/morph-browser/actions/*.qml
usr/share/morph-browser/webbrowser/
usr/share/applications/morph-browser.desktop
Expand Down
26 changes: 26 additions & 0 deletions morph-browser-splash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed morph-browser.png
Binary file not shown.
58 changes: 58 additions & 0 deletions morph-browser.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a9151e1

Please sign in to comment.