From a82c25e01d7ca95f167034e767f30f167c7d5989 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 068b886a..3ec9688d 100644 --- a/proj/vs2013/Common/Common.vcxproj +++ b/proj/vs2013/Common/Common.vcxproj @@ -507,7 +507,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> 25c8de44 (Visual studio package tutorial) diff --git a/proj/vs2017/Common/Common.vcxproj b/proj/vs2017/Common/Common.vcxproj index ee3c9e66..665eb335 100644 --- a/proj/vs2017/Common/Common.vcxproj +++ b/proj/vs2017/Common/Common.vcxproj @@ -569,6 +569,7 @@ +