Merge tag 'wine-1.9.0'

Release 1.9.0

 Conflicts:
	configure
	dlls/comdlg32/fontdlg.c
	include/wine/server_protocol.h

diff --cc configure
index e7a07eecd49872fccd6fd4e87646c6a7f4135935,ac6145a9c1b93d57692ecafee94edb2b95d02723..582beeb6671423346676541dc08939b341ae7679
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,8 -1,8 +1,8 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for Wine 1.8-rc4.
+ # Generated by GNU Autoconf 2.69 for Wine 1.9.0.
  #
 -# Report bugs to <wine-devel@winehq.org>.
 +# Report bugs to <wine@lists.etersoft.ru>.
  #
  #
  # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@@ -580,9 -580,9 +580,9 @@@ MAKEFLAGS
  # Identity of this package.
  PACKAGE_NAME='Wine'
  PACKAGE_TARNAME='wine'
- PACKAGE_VERSION='1.8-rc4'
- PACKAGE_STRING='Wine 1.8-rc4'
+ PACKAGE_VERSION='1.9.0'
+ PACKAGE_STRING='Wine 1.9.0'
 -PACKAGE_BUGREPORT='wine-devel@winehq.org'
 +PACKAGE_BUGREPORT='wine@lists.etersoft.ru'
  PACKAGE_URL='http://www.winehq.org'
  
  ac_unique_file="server/atom.c"

diff --cc configure.ac
Simple merge

diff --cc dlls/comdlg32/fontdlg.c
Simple merge

diff --cc dlls/kernel32/comm.c
Simple merge

diff --cc dlls/kernel32/path.c
Simple merge

diff --cc dlls/mshtml/tests/dom.c
Simple merge

diff --cc dlls/ntdll/directory.c
Simple merge

diff --cc dlls/ntoskrnl.exe/ntoskrnl.exe.spec
Simple merge

diff --cc dlls/ole32/compobj.c
Simple merge

diff --cc dlls/shell32/shlexec.c
Simple merge

diff --cc dlls/ws2_32/socket.c
Simple merge

diff --cc include/ddk/ntddk.h
Simple merge

diff --cc include/wine/server_protocol.h
Simple merge

diff --cc loader/wine.inf.in
Simple merge

diff --cc po/ar.po
Simple merge

diff --cc po/bg.po
Simple merge

diff --cc po/ca.po
Simple merge

diff --cc po/cs.po
Simple merge

diff --cc po/da.po
Simple merge

diff --cc po/de.po
Simple merge

diff --cc po/el.po
Simple merge

diff --cc po/en.po
Simple merge

diff --cc po/en_US.po
Simple merge

diff --cc po/eo.po
Simple merge

diff --cc po/es.po
Simple merge

diff --cc po/fa.po
Simple merge

diff --cc po/fi.po
Simple merge

diff --cc po/fr.po
Simple merge

diff --cc po/he.po
Simple merge

diff --cc po/hi.po
Simple merge

diff --cc po/hu.po
Simple merge

diff --cc po/it.po
Simple merge

diff --cc po/ja.po
Simple merge

diff --cc po/ko.po
Simple merge

diff --cc po/lt.po
Simple merge

diff --cc po/ml.po
Simple merge

diff --cc po/nb_NO.po
Simple merge

diff --cc po/nl.po
Simple merge

diff --cc po/or.po
Simple merge

diff --cc po/pa.po
Simple merge

diff --cc po/pl.po
Simple merge

diff --cc po/pt_BR.po
Simple merge

diff --cc po/pt_PT.po
Simple merge

diff --cc po/rm.po
Simple merge

diff --cc po/ro.po
Simple merge

diff --cc po/ru.po
Simple merge

diff --cc po/sk.po
Simple merge

diff --cc po/sl.po
Simple merge

diff --cc po/sr_RS@cyrillic.po
Simple merge

diff --cc po/sr_RS@latin.po
Simple merge

diff --cc po/sv.po
Simple merge

diff --cc po/te.po
Simple merge

diff --cc po/th.po
Simple merge

diff --cc po/tr.po
Simple merge

diff --cc po/uk.po
Simple merge

diff --cc po/wa.po
Simple merge

diff --cc po/wine.pot
Simple merge

diff --cc po/zh_CN.po
Simple merge

diff --cc po/zh_TW.po
Simple merge

diff --cc programs/services/rpc.c
Simple merge

diff --cc programs/winemenubuilder/winemenubuilder.c
Simple merge

diff --cc server/protocol.def
Simple merge

diff --cc server/request.h
Simple merge

diff --cc server/trace.c
Simple merge