Merge branch 'develop' of github.com:mapmapteam/mapmap into develop

This commit is contained in:
Alexandre Quessy
2014-12-28 17:24:08 -05:00
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -5,9 +5,9 @@ GenericName=Video Mapping editor
GenericName[fr]=Éditeur pour le video mapping
Comment=MapMap is a free/libre video projection mapping editor
Comment[fr]=MapMap est un éditeur pour la projection video mapping
Icon=mapmap
Exec=mapmap %U
Terminal=false
Type=Application
Categories=Qt;AudioVideo;Video;
Icon=/usr/share/icons/hicolor/scalable/apps/mapmap.svg
+3
View File
@@ -79,6 +79,9 @@ unix:!mac {
desktopfile.files = mapmap.desktop
desktopfile.path = /usr/share/applications
INSTALLS += desktopfile
iconfile.files = resources/images/logo/mapmap.svg
iconfile.path = /usr/share/icons/hicolor/scalable/apps
INSTALLS += iconfile
}
# Mac OS X-specific: