diff options
| author | JT Pennington <jt@obs-sec.com> | 2016-12-22 12:54:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-22 12:54:27 -0500 |
| commit | e78fefc9e727a93e33b48e2c5ee1b1a99f480242 (patch) | |
| tree | 33e6926989ea7c517426feebb89c366200da0fe0 /src-qt5/core-utils/lumina-config/pages/pages.pri | |
| parent | fix pages.pri (diff) | |
| parent | Fix an issue with ZFS snapshot finding where the directory path of interest n... (diff) | |
| download | lumina-e78fefc9e727a93e33b48e2c5ee1b1a99f480242.tar.gz lumina-e78fefc9e727a93e33b48e2c5ee1b1a99f480242.tar.bz2 lumina-e78fefc9e727a93e33b48e2c5ee1b1a99f480242.zip | |
Merge branch 'master' into master
Diffstat (limited to 'src-qt5/core-utils/lumina-config/pages/pages.pri')
| -rw-r--r-- | src-qt5/core-utils/lumina-config/pages/pages.pri | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src-qt5/core-utils/lumina-config/pages/pages.pri b/src-qt5/core-utils/lumina-config/pages/pages.pri index ed8995ab..ae306a80 100644 --- a/src-qt5/core-utils/lumina-config/pages/pages.pri +++ b/src-qt5/core-utils/lumina-config/pages/pages.pri @@ -15,7 +15,7 @@ HEADERS += $${PWD}/getPage.h \ $${PWD}/page_session_options.h \ $${PWD}/page_compton.h \ $${PWD}/page_mouse.h -# $${PWD}/page_bluetooth_trueos.h +# $${PWD}/page_bluetooth_trueos.h # $${PWD}/page_mouse_trueos.h @@ -33,8 +33,9 @@ SOURCES += $${PWD}/page_main.cpp \ $${PWD}/page_session_options.cpp \ $${PWD}/page_compton.cpp \ $${PWD}/page_mouse.cpp -# $${PWD}/page_bluetooth_trueos.cpp \ -# $${PWD}/page_mouse_trueos.cpp \ +# $${PWD}/page_bluetooth_trueos.cpp +# $${PWD}/page_mouse_trueos.cpp + FORMS += $${PWD}/page_main.ui \ @@ -51,5 +52,6 @@ FORMS += $${PWD}/page_main.ui \ $${PWD}/page_session_options.ui \ $${PWD}/page_compton.ui \ $${PWD}/page_mouse.ui -# $${PWD}/page_bluetooth_trueos.ui \ -# $${PWD}/page_mouse_trueos.ui \ +# $${PWD}/page_bluetooth_trueos.ui +# $${PWD}/page_mouse_trueos.ui + |