Changeset 5514 for pjproject/branches/projects/uwp/build/vs/pjproject-vs14-api-def.props

Timestamp:

Dec 28, 2016 5:20:16 AM (8 years ago)

Author:

riza

Message:

Re #1900: Fix merge conflict for solution file and project files. And fix some compile error found for UWP.

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• build/vs/pjproject-vs14-api-def.props (modified) (1 diff)

pjproject/branches/projects/uwp/build/vs/pjproject-vs14-api-def.props

@@ -10 +10 @@
      * WinPhone8    (Windows Phone 8)
     -->
-    <API_Family>UWP</API_Family>
+    <API_Family>WinDesktop</API_Family>
   </PropertyGroup>
 </Project>