xf86-video-ati: Branch 'master'

[Maarten Lankhorst]

 Makefile.am  |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 21a4f3eaca98c1c54bffcdf3926c631cec9c409d
Author: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Date:   Wed Jan 30 16:55:27 2013 +0100

    radeon: bump version for release
    
    And fixup distcheck..
    
    Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>

diff --git a/Makefile.am b/Makefile.am
index 4c278ba..f4f4233 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,4 +29,4 @@ INSTALL:
 ChangeLog:
 	$(CHANGELOG_CMD)
 
-dist-hook: ChangeLog INSTALL
+EXTRA_DIST = ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index d7d5c72..d73fbb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-ati],
-        [7.0.99],
+        [7.1.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-ati])