[vlc-commits] 1.2.0-pre4

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan  9 00:52:08 2012 +0100| [61a7b0013fb9da124825d983b1884786ed269442] | committer: Jean-Baptiste Kempf

1.2.0-pre4

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=61a7b0013fb9da124825d983b1884786ed269442
---

 NEWS         |    2 +-
 configure.ac |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 9696b8e..3d24ae4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Changes between 1.1.x and 1.2.0-rc1:
+Changes between 1.1.x and 1.2.0-pre4:
 ------------------------------------
 
 Important notes:
diff --git a/configure.ac b/configure.ac
index d138504..27bb143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,12 +2,12 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2012 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 1.2.0-rc1)
+AC_INIT(vlc, 1.2.0-pre4)
 VERSION_MAJOR=1
 VERSION_MINOR=2
 VERSION_REVISION=0
 VERSION_EXTRA=0
-VERSION_DEV=rc1
+VERSION_DEV=pre4
 
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)