Merge with trunk

[sojka/lightdm.git] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 09f8ecb9f15e16069a67674b34c147aaa49a31af..124458a2dca6d5ccdd1ad4a5fb3769369cd7d49a 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -28,6 +28,7 @@ Makefile.in.in
 ./mkinstalldirs
 ./omf.make
 ./xmldocs.make
+data/apparmor/lightdm-guest-session
 doc/html
 doc/lightdm-gobject-*.*
 doc/*.stamp
@@ -56,6 +57,8 @@ src/ldm-marshal.c
 src/ldm-marshal.h
 src/lightdm
 src/lightdm-guest-session-wrapper
+tests/*.log
+tests/*.trs
 tests/data/passwd
 tests/src/*_moc*.cpp
 tests/src/dbus-env