diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-04-16 18:03:18 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-04-16 18:03:18 +0200 |
| commit | cfc0202b42ad307391202ca776937b28ea7d2b03 (patch) | |
| tree | 03acc5d7d7bb0d35152bfc597eb788b938f09647 /nx-X11/programs/Xserver/hw/nxagent/Composite.c | |
| parent | fad840cfe558601a8ec02414f1235824bc9f3168 (diff) | |
| parent | a5f71f084e9f32e947a04da69edb7aae96d61697 (diff) | |
| download | nx-libs-cfc0202b42ad307391202ca776937b28ea7d2b03.tar.gz nx-libs-cfc0202b42ad307391202ca776937b28ea7d2b03.tar.bz2 nx-libs-cfc0202b42ad307391202ca776937b28ea7d2b03.zip | |
Merge branch 'sunweaver-pr/nxupgradeagent-cleanup' into arctica-3.6.x
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Composite.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Composite.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/nx-X11/programs/Xserver/hw/nxagent/Composite.c index c79104fc1..ae3cbb5a4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c @@ -24,18 +24,8 @@ #include "Options.h" #include "Windows.h" -#undef NXAGENT_UPGRADE - -#ifndef NXAGENT_UPGRADE - #include "NXcomposite.h" -#else - -#include "composite.h" - -#endif - /* * Set here the required log level. */ |