← Back to branch summary

~armagetronad-ct/armagetronad/0.4-advrim

« back to all changes in this revision

Viewing changes to desktop/Makefile.am

  • Committer: Voodoo
  • Date: 2013-04-11 10:46:24 UTC
  • Revision ID: voodoo-20130411104624-zse1f33o7ten188z
merge -r 1454..1476 lp:armagetronad/0.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
desktop/Makefile.am
8
8
nobase_desktopfile_DATA=armagetronad-armagetronad.desktop icons/small/armagetronad.png icons/medium/armagetronad.png icons/large/armagetronad.png armagetronad-armagetronad-handler.desktop armagetronad-link.xml
9
9
nobase_protocolfile_DATA=armagetronad.protocol
10
10
 
 
11
if OS_X_TOOLKIT
 
12
nobase_desktopfile_DATA += os-x/armagetronad.icns os-x/Info.plist
 
13
endif
11
14
 
12
15
EXTRA_DIST=icons/small/armagetronad.png\
13
16
           icons/medium/armagetronad.png\
15
18
                   armagetronad-armagetronad.desktop.in \
16
19
                   armagetronad-armagetronad-handler.desktop.in\
17
20
                   armagetronad-link.xml.in\
18
 
                   armagetronad.protocol.in
19
 
 
20
 
 
 
21
                   armagetronad.protocol.in\
 
22
                   os-x/armagetronad.icns os-x/Info.plist.in