xserver: Branch 'master'

[Adam Jackson]

 dri3/dri3int.h |   26 --------------------------
 1 file changed, 26 deletions(-)

New commits:
commit 3981dcdd489b60fbf356534a509ca93dcbedf769
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Sun Apr 17 20:34:43 2016 +0100

    dri3: remove unused file dri3int.h
    
    Copied during the prototyping stage and never used.
    
    Cc: Keith Packard <keithp at keithp.com>
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/dri3/dri3int.h b/dri3/dri3int.h
deleted file mode 100644
index 7f53eba..0000000
--- a/dri3/dri3int.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright © 2011 Daniel Stone
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Author: Daniel Stone <daniel at fooishbar.org>
- */
-
-extern Bool DRI2ModuleSetup(void);