Merged from trunk

[casparcg] / common / common.vcxproj.filters

diff --git a/common/common.vcxproj.filters b/common/common.vcxproj.filters
index 316c887503612ba7944114dfea40f46c5b04edf9..e256c07cdd8712cbb201b0ccce87cc57a0253bf9 100644 (file)
--- a/common/common.vcxproj.filters
+++ b/common/common.vcxproj.filters
@@ -10,27 +10,18 @@
     <Filter Include="source\os\windows">\r
       <UniqueIdentifier>{1f3002ae-ebb8-4195-8cf3-1a5b87822f38}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="source\memory">\r
-      <UniqueIdentifier>{9259676d-c225-4422-a50e-30d152d78dc2}</UniqueIdentifier>\r
-    </Filter>\r
     <Filter Include="source\gl">\r
       <UniqueIdentifier>{0d94bbc2-e196-4618-a90b-19392a3a0a8e}</UniqueIdentifier>\r
     </Filter>\r
     <Filter Include="source\diagnostics">\r
       <UniqueIdentifier>{29a29bcc-a9a0-4083-b713-c3773d18e177}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="source\concurrency">\r
-      <UniqueIdentifier>{644fe2e4-1199-4a0e-8d4c-63cf1ac82f1d}</UniqueIdentifier>\r
-    </Filter>\r
     <Filter Include="source\compiler">\r
       <UniqueIdentifier>{63471750-a430-4167-9b49-31b7a068a913}</UniqueIdentifier>\r
     </Filter>\r
     <Filter Include="source\compiler\vs">\r
       <UniqueIdentifier>{28c25c8a-1277-4d2c-9e85-5af33f9938ea}</UniqueIdentifier>\r
     </Filter>\r
-    <Filter Include="source\spl">\r
-      <UniqueIdentifier>{8b45f3e8-2ab4-4bee-8130-144a7bc795e8}</UniqueIdentifier>\r
-    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="diagnostics\graph.cpp">\r
@@ -40,41 +31,38 @@
     <ClCompile Include="gl\gl_check.cpp">\r
       <Filter>source\gl</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="env.cpp">\r
+    <ClCompile Include="log.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="utf.cpp">\r
+    <ClCompile Include="page_locked_allocator.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
     <ClCompile Include="prec_timer.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="log.cpp">\r
+    <ClCompile Include="tweener.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="except.cpp">\r
+    <ClCompile Include="utf.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="tweener.cpp">\r
+    <ClCompile Include="env.cpp">\r
       <Filter>source</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="memory\page_locked_allocator.cpp">\r
-      <Filter>source\memory</Filter>\r
+    <ClCompile Include="except.cpp">\r
+      <Filter>source</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="compiler\vs\stack_walker.cpp">\r
+      <Filter>source\compiler\vs</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="compiler\vs\disable_silly_warnings.h">\r
       <Filter>source\compiler\vs</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="concurrency\executor.h">\r
-      <Filter>source\concurrency</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="gl\gl_check.h">\r
       <Filter>source\gl</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="memory\page_locked_allocator.h">\r
-      <Filter>source\memory</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="diagnostics\graph.h">\r
       <Filter>source\diagnostics</Filter>\r
     </ClInclude>\r
@@ -85,54 +73,68 @@
     <ClInclude Include="os\windows\system_info.h">\r
       <Filter>source\os\windows</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="memory\memshfl.h">\r
-      <Filter>source\memory</Filter>\r
+    <ClInclude Include="os\windows\windows.h">\r
+      <Filter>source\os\windows</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="env.h">\r
+    <ClInclude Include="lock.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="concurrency\lock.h">\r
-      <Filter>source\concurrency</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="utf.h">\r
+    <ClInclude Include="log.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="prec_timer.h">\r
+    <ClInclude Include="memory.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="log.h">\r
+    <ClInclude Include="memshfl.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="forward.h">\r
+    <ClInclude Include="page_locked_allocator.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="enum_class.h">\r
+    <ClInclude Include="array.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
     <ClInclude Include="assert.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="os\windows\windows.h">\r
-      <Filter>source\os\windows</Filter>\r
+    <ClInclude Include="enum_class.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="reactive.h">\r
+    <ClInclude Include="env.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
     <ClInclude Include="except.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="executor.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="forward.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="future.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="param.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="prec_timer.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="reactive.h">\r
+      <Filter>source</Filter>\r
+    </ClInclude>\r
     <ClInclude Include="tweener.h">\r
       <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="concurrency\async.h">\r
-      <Filter>source\concurrency</Filter>\r
+    <ClInclude Include="utf.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="param.h" />\r
-    <ClInclude Include="spl\memory.h">\r
-      <Filter>source\spl</Filter>\r
+    <ClInclude Include="future_fwd.h">\r
+      <Filter>source</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="memory\memcpy.h">\r
-      <Filter>source\memory</Filter>\r
+    <ClInclude Include="compiler\vs\stack_walker.h">\r
+      <Filter>source\compiler\vs</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file