diff options
author | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-10-07 16:40:05 +0200 |
commit | 8f0ed7f7a754df710b13b9dabbaa32b5d4211182 (patch) | |
tree | 03bf52a933c29962894c2cec5f33028439cf4f5a /xorg-server/hw/kdrive/ephyr/ephyrproxyext.h | |
parent | 7d29f4054380e7f42722c280b9caedce9fa4ace9 (diff) | |
parent | 81fd17c8678e89cea6610b8b2996b028b21eb5dc (diff) | |
download | vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.gz vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.tar.bz2 vcxsrv-8f0ed7f7a754df710b13b9dabbaa32b5d4211182.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/glx/glxcmds.c
xorg-server/hw/kdrive/ephyr/ephyr.h
xorg-server/hw/kdrive/ephyr/ephyrinit.c
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyrproxyext.h')
-rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyrproxyext.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrproxyext.h b/xorg-server/hw/kdrive/ephyr/ephyrproxyext.h deleted file mode 100644 index 018b69b34..000000000 --- a/xorg-server/hw/kdrive/ephyr/ephyrproxyext.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Xephyr - A kdrive X server thats runs in a host X window. - * Authored by Matthew Allum <mallum@openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of OpenedHand Ltd not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. OpenedHand Ltd makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * OpenedHand Ltd DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL OpenedHand Ltd BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - * - * Authors: - * Dodji Seketeli <dodji@openedhand.com> - */ -#ifndef __EPHYRPROXYEXT_H__ -#define __EPHYRPROXYEXT_H__ - -Bool ephyrProxyExtensionInit(const char *a_extension_name); - -#endif /*__EPHYRPROXYEXT_H__*/ |