ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
gregory.hainaut 2012-09-08 16:11:21 +00:00
parent b247a7db07
commit 1c4a900dbd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
View File

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

4
plugins/GSdx/GS.cpp
View File

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