[X2Go-Commits] [nx-libs] 20/53: Merge branch 'sunweaver-pr/libxf86rush-cleanup' into arctica-3.6.x

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit e7dfbd511d3b0a358f94b880f2212b74f9e42e70
Merge: fb2a4e4 5365f90
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Jun 22 03:38:46 2015 +0200

    Merge branch 'sunweaver-pr/libxf86rush-cleanup' into arctica-3.6.x
    
    Attributes GH PR #42: https://github.com/ArcticaProject/nx-libs/pull/42

 nx-X11/config/cf/Imake.tmpl             |   30 ----
 nx-X11/config/cf/X11.tmpl               |   40 -----
 nx-X11/config/cf/host.def               |   44 -----
 nx-X11/config/cf/linux.cf               |   20 ---
 nx-X11/config/cf/xorg.cf                |    7 -
 nx-X11/config/cf/xorgsite.def           |   42 -----
 nx-X11/include/extensions/Imakefile     |    6 -
 nx-X11/include/extensions/xf86rush.h    |  113 ------------
 nx-X11/include/extensions/xf86rushstr.h |  163 -----------------
 nx-X11/lib/Imakefile                    |    6 -
 nx-X11/lib/Xxf86rush/Imakefile          |   30 ----
 nx-X11/lib/Xxf86rush/XF86Rush.c         |  291 -------------------------------
 12 files changed, 792 deletions(-)

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git