Merge branch 'master' into journal

[elogind.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b5fc8d72b01054f76a02c740db3b61206b93bd37..265801ff5fc71a801f3f8b03aa609f8332d41fdf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,42 @@
+systemd-journalctl
+systemd-journald
+test-id128
+test-journal
+test-install
+org.freedesktop.hostname1.xml
+org.freedesktop.locale1.xml
+org.freedesktop.timedate1.xml
+libsystemd-daemon.pc
+libsystemd-login.pc
+test-login
+systemd-loginctl
+systemd-localed
+systemd-timedated
+systemd-uaccess
+systemd-logind
+systemd-hostnamed
+systemd-binfmt
+systemd-getty-generator
+systemd-nspawn
+systemd-stdio-bridge
+systemd-machine-id-setup
+systemd-detect-virt
+systemd-sysctl
+test-strv
+systemd-ac-power
+systemd-timestamp
+systemd-cryptsetup
+systemd-cryptsetup-generator
+systemd-tty-ask-password-agent
+systemd-fsck
+systemd-quotacheck
+systemd-user-sessions
+systemd-shutdown
+systemd-tmpfiles
 systemd-readahead-collect
 systemd-readahead-replay
 systemd-reply-password
-systemd-ask-password-agent
+systemd-gnome-ask-password-agent
 systemd-ask-password
 systemd-kmsg-syslogd
 systemd-remount-api-vfs
@@ -27,7 +62,7 @@ systemd-initctl
 systemd
 test-engine
 test-job-type
-systemd-logger
+systemd-stdout-syslog-bridge
 systemctl
 systemadm
 .dirstamp
@@ -60,9 +95,10 @@ install-sh
 missing
 stamp-*
 *.stamp
-Makefile
+/Makefile
 ltmain.sh
 *.tar.bz2
 *.tar.gz
 *.tar.xz
 libtool
+.vimrc