diff options
author | Brad Davis <[email protected]> | 2013-08-16 12:01:23 -0700 |
---|---|---|
committer | Brad Davis <[email protected]> | 2013-08-16 12:01:23 -0700 |
commit | e384cffd7245d1141f9ca81633ab62b07b8907f3 (patch) | |
tree | c5e4debbbe6079ff14b7862cde49bf3b916ffb62 /Samples/OculusRoomTiny | |
parent | 20cfcf9dc9485002f05cf50d74ab45375cf0db59 (diff) | |
parent | f29e505a7df820e1376d97b41515bdc89d472499 (diff) |
Merge branch 'master' into stable
Diffstat (limited to 'Samples/OculusRoomTiny')
-rw-r--r-- | Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj | 2 | ||||
-rw-r--r-- | Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj.filters | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj b/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj index 4bc37a8..5ed8886 100644 --- a/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj +++ b/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> diff --git a/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj.filters b/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj.filters index 3c09bd5..5643d9f 100644 --- a/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj.filters +++ b/Samples/OculusRoomTiny/OculusRoomTiny_Msvc2010.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <ClCompile Include="OculusRoomModel.cpp" /> |