diff options
| author | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
| commit | e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5 (patch) | |
| tree | 9d57b5fdd6737bc3449851a87e573abe7be984a6 /devtools/skycpt/AsciiCptCompile.sln | |
| parent | deab5b28753155863062746ef1239535f562fd0b (diff) | |
| parent | 842b471e45ae8b7c1b4516b9bd5bf39d61112077 (diff) | |
| download | scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.gz scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.bz2 scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'devtools/skycpt/AsciiCptCompile.sln')
| -rw-r--r-- | devtools/skycpt/AsciiCptCompile.sln | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/devtools/skycpt/AsciiCptCompile.sln b/devtools/skycpt/AsciiCptCompile.sln deleted file mode 100644 index 93de755bf3..0000000000 --- a/devtools/skycpt/AsciiCptCompile.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AsciiCptCompile", "AsciiCptCompile.vcproj", "{BDAC73AF-42DE-45E7-95A8-C1D906AD19EF}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {BDAC73AF-42DE-45E7-95A8-C1D906AD19EF}.Debug.ActiveCfg = Debug|Win32 - {BDAC73AF-42DE-45E7-95A8-C1D906AD19EF}.Debug.Build.0 = Debug|Win32 - {BDAC73AF-42DE-45E7-95A8-C1D906AD19EF}.Release.ActiveCfg = Release|Win32 - {BDAC73AF-42DE-45E7-95A8-C1D906AD19EF}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal |