tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into 'master' 

Dev -> Master

See merge request b0/matrique!15
This commit is contained in:
Black Hat 2018-08-16 03:43:45 +00:00
parent 2c7d503ff1 e56075a139
commit d4be81c003
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
icons/matrique.png → icons/org.eu.encom.matrique.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

6
matrique.pro
View File

@ -69,11 +69,11 @@ HEADERS += \
src/emojimodel.h src/emojimodel.h
unix:!mac { unix:!mac {
metainfo.files = $$PWD/matrique.appdata.xml metainfo.files = $$PWD/org.eu.encom.matrique.appdata.xml
metainfo.path = $$PREFIX/share/metainfo metainfo.path = $$PREFIX/share/metainfo
desktop.files = $$PWD/matrique.desktop desktop.files = $$PWD/org.eu.encom.matrique.desktop
desktop.path = $$PREFIX/share/applications desktop.path = $$PREFIX/share/applications
icons.files = $$PWD/icons/matrique.png icons.files = $$PWD/icons/org.eu.encom.matrique.png
icons.path = $$PREFIX/share/icons/hicolor/128x128/apps icons.path = $$PREFIX/share/icons/hicolor/128x128/apps
INSTALLS += metainfo desktop mime icons INSTALLS += metainfo desktop mime icons
} }

0
matrique.appdata.xml → org.eu.encom.matrique.appdata.xml
View File

3
matrique.desktop → org.eu.encom.matrique.desktop
View File

@ -4,7 +4,6 @@ GenericName=Matrix Client
Comment=IM client for the Matrix protocol Comment=IM client for the Matrix protocol
Exec=matrique Exec=matrique
Terminal=false Terminal=false
Icon=matrique Icon=org.eu.encom.matrique
Type=Application Type=Application
Categories=Network;InstantMessaging; Categories=Network;InstantMessaging;
Name[en_US]=Matrique