Merge remote-tracking branch 'origin/released'

Conflicts:
	libfontenc/src/fontenc.c

1 files changed, 42 insertions, 42 deletions

diff --git a/libXinerama/Makefile.am b/libXinerama/Makefile.am
index 86f6e7fd8..d744d0f91 100644
--- a/libXinerama/Makefile.am
+++ b/libXinerama/Makefile.am
@@ -1,42 +1,42 @@
-# 

-#  Copyright 2005  Red Hat, Inc.

-# 

-#  Permission to use, copy, modify, distribute, and sell this software and its

-#  documentation for any purpose is hereby granted without fee, provided that

-#  the above copyright notice appear in all copies and that both that

-#  copyright notice and this permission notice appear in supporting

-#  documentation, and that the name of Red Hat not be used in

-#  advertising or publicity pertaining to distribution of the software without

-#  specific, written prior permission.  Red Hat makes no

-#  representations about the suitability of this software for any purpose.  It

-#  is provided "as is" without express or implied warranty.

-# 

-#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

-#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

-#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

-#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-#  PERFORMANCE OF THIS SOFTWARE.

-

-SUBDIRS = src man

-

-pkgconfigdir = $(libdir)/pkgconfig

-pkgconfig_DATA = xinerama.pc

-

-MAINTAINERCLEANFILES = ChangeLog INSTALL

-

-.PHONY: ChangeLog INSTALL

-

-INSTALL:

-	$(INSTALL_CMD)

-

-ChangeLog:

-	$(CHANGELOG_CMD)

-

-dist-hook: ChangeLog INSTALL

-

-if LINT

-lint:

-	(cd src && $(MAKE) $(MFLAGS) lint)

-endif LINT

+#
+#  Copyright 2005  Red Hat, Inc.
+#
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+#
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+SUBDIRS = src man
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xinerama.pc
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
+
+if LINT
+lint:
+	(cd src && $(MAKE) $(MFLAGS) lint)
+endif LINT