diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-02-20 14:58:04 -0800 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-02-20 14:58:04 -0800 |
| commit | 2cdefeb6dafa9d8405ddd1247967ca6e3267b1a7 (patch) | |
| tree | bb10c3dac909b2bc4b50cbf606f3c631d089ec17 | |
| parent | a8c7bba19ea486bd21f4fd1f2050bf899478fdaa (diff) | |
| parent | b9958e6ec5115822b1c2112da5ef2652aa847a51 (diff) | |
Merge remote branch 'origin/master' into qcdm
| -rw-r--r-- | policy/Makefile.am | 15 | ||||
| -rw-r--r-- | policy/modem-manager.png | bin | 0 -> 817 bytes |
2 files changed, 15 insertions, 0 deletions
diff --git a/policy/Makefile.am b/policy/Makefile.am new file mode 100644 index 00000000..81a817b2 --- /dev/null +++ b/policy/Makefile.am @@ -0,0 +1,15 @@ +icondir=${datadir}/icons/hicolor/22x22/apps +icon_DATA = modem-manager.png + +polkit_policydir = $(datadir)/polkit-1/actions + +dist_polkit_policy_in_files = org.freedesktop.modem-manager.policy.in +dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy) + +@INTLTOOL_POLICY_RULE@ + +clean-local : + rm -f *~ + +EXTRA_DIST = $(dist_polkit_policy_in_files) $(icon_DATA) + diff --git a/policy/modem-manager.png b/policy/modem-manager.png Binary files differnew file mode 100644 index 00000000..386abd54 --- /dev/null +++ b/policy/modem-manager.png |
