1.0:

* merge commit 5381 (that fixed some GSdx ogl crash)
* update debian package with the good branch name


git-svn-id: http://pcsx2.googlecode.com/svn/branches/1.0@5409 96395faa-99c1-11dd-bbfe-3dabce05a288

debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh

@@ -32,7 +32,7 @@ EOF
 
 # Default value
 SVN_CO_VERSION=0;
-BRANCH="1.0.0"
+BRANCH="1.0"
 LOCAL=0
 while [ -n "$1" ]; do
 case $1 in
@@ -57,8 +57,8 @@ else
 fi
 
 # Debian name of package and tarball
-PKG_NAME="pcsx2.snapshot-${SVN_CO_VERSION}"
-TAR_NAME="pcsx2.snapshot_${SVN_CO_VERSION}.orig.tar"
+PKG_NAME="pcsx2-1.0.0"
+TAR_NAME="pcsx2_1.0.0.orig.tar"
 
 # Directory
 TMP_DIR=/tmp

plugins/GSdx/GS.cpp

@@ -514,6 +514,10 @@ EXPORT_C GSvsync(int field)
 
 #endif
 
+#ifdef OGL_MT_HACK
+	s_gs->m_wnd.AttachContext();
+#endif
+
 	s_gs->VSync(field);
 }