proto/randrproto: Branch 'master' - 2 commits

[Keith Packard]

 configure.ac   |   12 ++++++++----
 randrproto.txt |    4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 240bb6051dccd072c95c8569a62b1222213ef396
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Oct 5 20:04:11 2009 -0700

    Bump version to 1.3.1
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 4cebbbd..5cfa3ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT([RandrProto], [1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RandrProto], [1.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_CHANGELOG
diff --git a/randrproto.txt b/randrproto.txt
index 2f8b465..c56bd5f 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1,6 +1,6 @@
 	       The X Resize, Rotate and Reflect Extension
-			      Version 1.3
-			       2006-20-7
+			     Version 1.3.1
+			       2009-10-5
 
 			      Jim Gettys
 			   Jim.Gettys at hp.com
commit e5ea87cd2a1c7b636d95f42daf3f36ba3104d59d
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Oct 5 20:20:14 2009 -0700

    Add XORG_DEFAULT_OPTIONS invocation in configure.ac
    
    This should be included in all xorg configure.ac files to provide a
    hook for setting various default values.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 320e560..4cebbbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,13 @@ AC_INIT([RandrProto], [1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?produ
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-XORG_RELEASE_VERSION
+
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
+XORG_DEFAULT_OPTIONS
+
 XORG_CHANGELOG
 
 AC_OUTPUT([Makefile