From 6bd0a89ae9272dcad265a6415d93f14149619096 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Sat, 22 Mar 2025 08:31:41 -0500 Subject: [PATCH] Visual studio package tutorial --- proj/vs2013/Common/Common.vcxproj | 4 ++++ proj/vs2017/Common/Common.vcxproj | 1 + 2 files changed, 5 insertions(+) diff --git a/proj/vs2013/Common/Common.vcxproj b/proj/vs2013/Common/Common.vcxproj index b9be0f8f..11ee0fdf 100644 --- a/proj/vs2013/Common/Common.vcxproj +++ b/proj/vs2013/Common/Common.vcxproj @@ -504,7 +504,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> 25c8de44 (Visual studio package tutorial) diff --git a/proj/vs2017/Common/Common.vcxproj b/proj/vs2017/Common/Common.vcxproj index 3341613c..ab8137c2 100644 --- a/proj/vs2017/Common/Common.vcxproj +++ b/proj/vs2017/Common/Common.vcxproj @@ -563,6 +563,7 @@ +