Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

Conflicts:

	hw/xfree86/loader/Makefile.am
	hw/xfree86/loader/xf86sym.c

5 files changed, 10 insertions, 0 deletions

diff --git a/hw/xfree86/utils/gtf/.gitignore b/hw/xfree86/utils/gtf/.gitignore
new file mode 100644
index 000000000..741071d52
--- /dev/null
+++ b/hw/xfree86/utils/gtf/.gitignore
@@ -0,0 +1,2 @@
+gtf.1
+gtf.1x
diff --git a/hw/xfree86/utils/pcitweak/.gitignore b/hw/xfree86/utils/pcitweak/.gitignore
new file mode 100644
index 000000000..c866baf62
--- /dev/null
+++ b/hw/xfree86/utils/pcitweak/.gitignore
@@ -0,0 +1,3 @@
+pcitweak.1
+pcitweak.1x
+
diff --git a/hw/xfree86/utils/scanpci/.gitignore b/hw/xfree86/utils/scanpci/.gitignore
new file mode 100644
index 000000000..b752c7455
--- /dev/null
+++ b/hw/xfree86/utils/scanpci/.gitignore
@@ -0,0 +1,2 @@
+scanpci.1
+scanpci.1x
diff --git a/hw/xfree86/utils/xorgcfg/.gitignore b/hw/xfree86/utils/xorgcfg/.gitignore
new file mode 100644
index 000000000..378869b1c
--- /dev/null
+++ b/hw/xfree86/utils/xorgcfg/.gitignore
@@ -0,0 +1,2 @@
+xorgcfg.1
+xorgcfg.1x
diff --git a/hw/xfree86/utils/xorgconfig/.gitignore b/hw/xfree86/utils/xorgconfig/.gitignore
new file mode 100644
index 000000000..6f3cabd65
--- /dev/null
+++ b/hw/xfree86/utils/xorgconfig/.gitignore
@@ -0,0 +1 @@
+xorgconfig.1