[vlc-commits] 1.2.0-pre2

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Nov 28 01:46:13 2011 +0100| [c4eda88dffd4370e582da774a7de5cc8069d3d09] | committer: Jean-Baptiste Kempf

1.2.0-pre2

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

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

diff --git a/NEWS b/NEWS
index 2827bca..81be238 100644
--- a/NEWS
+++ b/NEWS
@@ -68,6 +68,7 @@ Access:
  * QTSound: added support for all QTKit-compatible audio input devices
  * X11 Screen: support for capturing partially hidden windows
  * MPEG DASH (Dynamic Adaptive Streaming over HTTP) support
+ * Support for HTTPS is now fixed for the Windows port
 
 Codecs:
  * You can now use ffmpeg-mt in conjunction with vlc
@@ -123,6 +124,7 @@ Interfaces:
  * webUI/http: path values for input and output are deprecated in favour of uri
  * Qt/Win32: the update system now downloads the updates in the temp folder
  * Qt: preferences are now searchable
+ * Qt: the fullscreen controller is now stackable, full-width, at the bottom
 
 Video Output:
  * New video output based on Direct2D for Windows 7 and Vista (with Platform Update)
diff --git a/configure.ac b/configure.ac
index 9344af9..14c7c78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
 dnl Autoconf settings for vlc
 
-AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team])
+AC_COPYRIGHT([Copyright 2002-2011 VLC authors and VideoLAN])
 
 AC_INIT(vlc, 1.2.0-pre2)
 VERSION_MAJOR=1
 VERSION_MINOR=2
 VERSION_REVISION=0
 VERSION_EXTRA=0
-VERSION_DEV=pre1
+VERSION_DEV=pre2
 
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)