diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-03-01 09:07:05 -0800 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-03-01 09:07:05 -0800 |
| commit | f6c514897e40e768b180963f2782ed60527ffaa6 (patch) | |
| tree | 3a0619829a4b1eaee11d7f196b30021e6b7d1127 /.gitignore | |
| parent | 7a0373afee63eeb9e677f61ccd19fd4aed549ac9 (diff) | |
| parent | 9d7cb0ddcf69993903c5bc51bbbfbd3a57f55413 (diff) | |
Merge remote branch 'origin/master' into qcdm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -23,6 +23,7 @@ libtool *-glue.h *.tar.bz2 org.freedesktop.ModemManager.service +org.freedesktop.ModemManager.conf ModemManager.pc marshallers/mm-marshal.[ch] src/modem-manager @@ -30,6 +31,7 @@ docs/spec.html callouts/mm-modem-probe test/lsudev src/tests/test-modem-helpers +policy/org.freedesktop.modem-manager.policy libqcdm/tests/test-qcdm |