diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-22 08:35:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-22 08:35:52 +0200 |
| commit | 2cb91952f6e94907b3614535edbfc3f979085694 (patch) | |
| tree | 6d11e620b1c10564f344d469a5d730e1df7fbb90 /xorg-server/hw/xfree86/parser/read.c | |
| parent | 7ec34a94883810e9f4a8e417f00300c2c31808b0 (diff) | |
| parent | e1a407256a5c1571d8f4871fd981a51cfbd46e37 (diff) | |
| download | vcxsrv-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/read.c')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/read.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/parser/read.c b/xorg-server/hw/xfree86/parser/read.c index eef873e89..6545bcdae 100644 --- a/xorg-server/hw/xfree86/parser/read.c +++ b/xorg-server/hw/xfree86/parser/read.c @@ -52,8 +52,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 |