diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index 7be1d02092..1026dd5286 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -10,7 +10,7 @@ supported but exist anyways.)
_____________________________________________________________________________
================================================================================
-sm-ssc v1.2.3 | 201103??
+sm-ssc v1.2.3 | 20110323
--------------------------------------------------------------------------------
20110309
diff --git a/Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir b/Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir
deleted file mode 100644
index 4d26295a4a..0000000000
--- a/Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir
+++ /dev/null
@@ -1 +0,0 @@
-_CombinedLifeMeterTug stream p1
\ No newline at end of file
diff --git a/Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir b/Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir
deleted file mode 100644
index 5189a43350..0000000000
--- a/Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir
+++ /dev/null
@@ -1 +0,0 @@
-_CombinedLifeMeterTug stream p2
\ No newline at end of file
diff --git a/Xcode/Info-StepMania.plist b/Xcode/Info-StepMania.plist
index bb5906c43a..580247540e 100644
--- a/Xcode/Info-StepMania.plist
+++ b/Xcode/Info-StepMania.plist
@@ -1,57 +1,57 @@
-
-
-
-
- CFBundleDevelopmentRegion
- English
- CFBundleDocumentTypes
-
-
- CFBundleTypeExtensions
-
- smzip
-
- CFBundleTypeIconFile
- smicon.icns
- CFBundleTypeMIMETypes
-
- application/zip
-
- CFBundleTypeName
- SMZip
- CFBundleTypeRole
- Editor
- LSTypeIsPackage
-
- NSPersistentStoreTypeKey
- Binary
-
-
- CFBundleExecutable
- EXECUTABLE_NAME
- CFBundleGetInfoString
- PRODUCT_FAMILY_BARE PRODUCT_VER_BARE
- CFBundleIconFile
- smicon.icns
- CFBundleIdentifier
- com.PRODUCT_ID_BARE
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- PRODUCT_FAMILY_BARE
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
- PRODUCT_VER_BARE
- CFBundleSignature
- Step
- CFBundleVersion
- PRODUCT_VER_BARE
- LSMinimumSystemVersion
- 10.4.10
- NSHumanReadableCopyright
- Copyright 2001-2010
- NSPrincipalClass
- SMApplication
-
-
+
+
+
+
+ CFBundleDevelopmentRegion
+ English
+ CFBundleDocumentTypes
+
+
+ CFBundleTypeExtensions
+
+ smzip
+
+ CFBundleTypeIconFile
+ smicon.icns
+ CFBundleTypeMIMETypes
+
+ application/zip
+
+ CFBundleTypeName
+ SMZip
+ CFBundleTypeRole
+ Editor
+ LSTypeIsPackage
+
+ NSPersistentStoreTypeKey
+ Binary
+
+
+ CFBundleExecutable
+ EXECUTABLE_NAME
+ CFBundleGetInfoString
+ PRODUCT_FAMILY_BARE PRODUCT_VER_BARE
+ CFBundleIconFile
+ smicon.icns
+ CFBundleIdentifier
+ com.PRODUCT_ID_BARE
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ PRODUCT_FAMILY_BARE
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ PRODUCT_VER_BARE
+ CFBundleSignature
+ Step
+ CFBundleVersion
+ PRODUCT_VER_BARE
+ LSMinimumSystemVersion
+ 10.4.10
+ NSHumanReadableCopyright
+ Copyright 2001-2011
+ NSPrincipalClass
+ SMApplication
+
+
diff --git a/src/ProductInfo.h b/src/ProductInfo.h
index 2083e30323..8470d29ae5 100644
--- a/src/ProductInfo.h
+++ b/src/ProductInfo.h
@@ -35,7 +35,7 @@
*
*/
#ifndef PRODUCT_VER_BARE
-#define PRODUCT_VER_BARE v1.2.2
+#define PRODUCT_VER_BARE v1.2.3
#endif
/**
diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc
index e77a3c743b..e47653133d 100644
--- a/src/ProductInfo.inc
+++ b/src/ProductInfo.inc
@@ -5,7 +5,7 @@
; see ProductInfo.h for use descriptions
!define PRODUCT_ID "sm-ssc"
-!define PRODUCT_VER "v1.2.2"
+!define PRODUCT_VER "v1.2.3"
!define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
!define PRODUCT_BITMAP "ssc"
diff --git a/src/StepMania-net2008.vcproj b/src/StepMania-net2008.vcproj
index 4393682851..db3c4a01c2 100644
--- a/src/StepMania-net2008.vcproj
+++ b/src/StepMania-net2008.vcproj
@@ -1480,15 +1480,14 @@
RelativePath="NotesWriterSM.h"
>
-
-
-
+
-
-
+
diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index bddafb3b79..43c56d2a10 100644
--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -28,6 +28,7 @@ namespace avcodec
#endif
};
+/*
#if defined(_MSC_VER) && !defined(XBOX)
#pragma comment(lib, "ffmpeg/lib/avcodec.lib")
#pragma comment(lib, "ffmpeg/lib/avformat.lib")
@@ -35,6 +36,7 @@ namespace avcodec
#pragma comment(lib, "ffmpeg/lib/swscale.lib")
#endif
#endif // _MSC_VER && !XBOX
+*/
#if defined(XBOX)
/* NOTES: ffmpeg static libraries arent included in SVN. You have to build