[vlc-devel] commit: Prepare for 1.0.4-rc, update NEWS ( Rafaël Carré )

[git version control]

vlc | branch: 1.0-bugfix | Rafaël Carré <rafael.carre at gmail.com> | Mon Nov 16 21:47:22 2009 +0100| [f6201f23e744923964b3decdd7d6c238243fe44b] | committer: Rafaël Carré 

Prepare for 1.0.4-rc, update NEWS

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

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

diff --git a/NEWS b/NEWS
index e686724..27055e5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Changes between 1.0.3 and 1.0.4-rc:
+--------------------------------
+
+Unix:
+ * Fix XCB globalhotkeys : support xcb-keysyms >= 0.3.4 and fix a bug spotted on FreeBSD where all keyboard input would be impossible
+
 Changes between 1.0.2 and 1.0.3:
 --------------------------------
 
diff --git a/configure.ac b/configure.ac
index 1c9443d..deb4408 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2009 the VideoLAN team])
 
-AC_INIT(vlc, 1.0.3)
+AC_INIT(vlc, 1.0.4-rc)
 VERSION_MAJOR="1"
 VERSION_MINOR="0"
-VERSION_REVISION="3"
-VERSION_EXTRA=""
+VERSION_REVISION="4"
+VERSION_EXTRA="rc"
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)