diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-14 15:26:50 +0100 |
| commit | c67a0f76ca34e441a817a7cdf261f496f3b3f2d6 (patch) | |
| tree | c197b74a8c2f076aaa4f5506b90d6ad8e38b52b2 /X11/xtrans/Makefile.am | |
| parent | 8d07c58314685d56a0586d0a437b541ea2b92a54 (diff) | |
| parent | 2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 (diff) | |
| download | vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.gz vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.tar.bz2 vcxsrv-c67a0f76ca34e441a817a7cdf261f496f3b3f2d6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'X11/xtrans/Makefile.am')
| -rw-r--r-- | X11/xtrans/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/X11/xtrans/Makefile.am b/X11/xtrans/Makefile.am index 9ff172370..38c34c33f 100644 --- a/X11/xtrans/Makefile.am +++ b/X11/xtrans/Makefile.am @@ -7,7 +7,6 @@ Xtransinclude_HEADERS = \ Xtransint.h \ Xtranslcl.c \ Xtranssock.c \ - Xtranstli.c \ Xtransutil.c \ transport.c |