xserver: Branch 'master'

[Adam Jackson]

 configure.ac |    2 +-
 meson.build  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bac7b0b421115448516da4b6214f07851dc7cdeb
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Feb 28 11:38:27 2018 -0500

    xorgproto 2018.4
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/configure.ac b/configure.ac
index 8116da5..51d77bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.60])
-AC_INIT([xorgproto], [2018.3],
+AC_INIT([xorgproto], [2018.4],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
diff --git a/meson.build b/meson.build
index 6fb1541..071108d 100644
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-project('xorgproto', 'c', license : 'MIT', version : '2018.3')
+project('xorgproto', 'c', license : 'MIT', version : '2018.4')
 pkg = import('pkgconfig')
 cc = meson.get_compiler('c')
 sed = find_program('sed')