aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/parser/write.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-22 08:35:52 +0200
committermarha <marha@users.sourceforge.net>2012-06-22 08:35:52 +0200
commit2cb91952f6e94907b3614535edbfc3f979085694 (patch)
tree6d11e620b1c10564f344d469a5d730e1df7fbb90 /xorg-server/hw/xfree86/parser/write.c
parent7ec34a94883810e9f4a8e417f00300c2c31808b0 (diff)
parente1a407256a5c1571d8f4871fd981a51cfbd46e37 (diff)
downloadvcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.tar.gz
vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.tar.bz2
vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
Diffstat (limited to 'xorg-server/hw/xfree86/parser/write.c')
-rw-r--r--xorg-server/hw/xfree86/parser/write.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/parser/write.c b/xorg-server/hw/xfree86/parser/write.c
index c001c3d51..9c706a062 100644
--- a/xorg-server/hw/xfree86/parser/write.c
+++ b/xorg-server/hw/xfree86/parser/write.c
@@ -51,8 +51,6 @@
* authorization from the copyright holder(s) and author(s).
*/
-/* View/edit this file with tab stops set to 4 */
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif