@@ -153,9 +153,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "12906", "12906\12906.vcxpro
153153EndProject
154154Project ("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" ) = "42586" , "42586\42586.vcxproj" , "{3D4D98F1-AAFC-4788-888A-BFC4F216BCED}"
155155EndProject
156- <<<<<<< HEAD
157- Project ("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" ) = "no1316" , "no1316\no1316.vcxproj" , "{D3EDA63D-22E7-4ACC-8F44-AEECC20387FC}"
158- =======
159156Project ("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" ) = "no10926" , "no10926\no10926.vcxproj" , "{FB847D53-02EA-4011-B68F-902C94899181}"
160157EndProject
161158Project ("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" ) = "no18108" , "no18108\no18108.vcxproj" , "{EE83C429-8E4B-4953-8229-B61C201E18B9}"
@@ -171,7 +168,6 @@ EndProject
171168Project ("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" ) = "no2525" , "no2525\no2525.vcxproj" , "{1682E5C6-C9ED-4FF4-BC9C-76979901F5C2}"
172169EndProject
173170Project ("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" ) = "no2480" , "no2480\no2480.vcxproj" , "{55F8FCA7-011E-41FC-B99D-235748B6C054}"
174- >>>>>>> 2 b 0917068215 ce 4 c 2 ac 95662 fe 7 a 23 e 88 c 7 add 4 f
175171EndProject
176172Global
177173 GlobalSection (SolutionConfigurationPlatforms ) = preSolution
@@ -781,81 +777,6 @@ Global
781777 {3D4D98F1-AAFC-4788-888A-BFC4F216BCED} .Release| x64 .Build .0 = Release| x64
782778 {3D4D98F1-AAFC-4788-888A-BFC4F216BCED} .Release| x86 .ActiveCfg = Release| Win32
783779 {3D4D98F1-AAFC-4788-888A-BFC4F216BCED} .Release| x86 .Build .0 = Release| Win32
784- <<<<<<< HEAD
785- {D3EDA63D-22E7-4ACC-8F44-AEECC20387FC} .Debug| x64 .ActiveCfg = Debug| x64
786- {D3EDA63D-22E7-4ACC-8F44-AEECC20387FC} .Debug| x64 .Build .0 = Debug| x64
787- {D3EDA63D-22E7-4ACC-8F44-AEECC20387FC} .Debug| x86 .ActiveCfg = Debug| Win32
788- {D3EDA63D-22E7-4ACC-8F44-AEECC20387FC} .Debug| x86 .Build .0 = Debug| Win32
789- {D3EDA63D-22E7-4ACC-8F44-AEECC20387FC} .Release| x64 .ActiveCfg = Release| x64
790- {D3EDA63D-22E7-4ACC-8F44-AEECC20387FC} .Release| x64 .Build .0 = Release| x64
791- {D3EDA63D-22E7-4ACC-8F44-AEECC20387FC} .Release| x86 .ActiveCfg = Release| Win32
792- {D3EDA63D-22E7-4ACC-8F44-AEECC20387FC} .Release| x86 .Build .0 = Release| Win32
793- =======
794- {FB847D53-02EA-4011-B68F-902C94899181} .Debug| x64 .ActiveCfg = Debug| x64
795- {FB847D53-02EA-4011-B68F-902C94899181} .Debug| x64 .Build .0 = Debug| x64
796- {FB847D53-02EA-4011-B68F-902C94899181} .Debug| x86 .ActiveCfg = Debug| Win32
797- {FB847D53-02EA-4011-B68F-902C94899181} .Debug| x86 .Build .0 = Debug| Win32
798- {FB847D53-02EA-4011-B68F-902C94899181} .Release| x64 .ActiveCfg = Release| x64
799- {FB847D53-02EA-4011-B68F-902C94899181} .Release| x64 .Build .0 = Release| x64
800- {FB847D53-02EA-4011-B68F-902C94899181} .Release| x86 .ActiveCfg = Release| Win32
801- {FB847D53-02EA-4011-B68F-902C94899181} .Release| x86 .Build .0 = Release| Win32
802- {EE83C429-8E4B-4953-8229-B61C201E18B9} .Debug| x64 .ActiveCfg = Debug| x64
803- {EE83C429-8E4B-4953-8229-B61C201E18B9} .Debug| x64 .Build .0 = Debug| x64
804- {EE83C429-8E4B-4953-8229-B61C201E18B9} .Debug| x86 .ActiveCfg = Debug| Win32
805- {EE83C429-8E4B-4953-8229-B61C201E18B9} .Debug| x86 .Build .0 = Debug| Win32
806- {EE83C429-8E4B-4953-8229-B61C201E18B9} .Release| x64 .ActiveCfg = Release| x64
807- {EE83C429-8E4B-4953-8229-B61C201E18B9} .Release| x64 .Build .0 = Release| x64
808- {EE83C429-8E4B-4953-8229-B61C201E18B9} .Release| x86 .ActiveCfg = Release| Win32
809- {EE83C429-8E4B-4953-8229-B61C201E18B9} .Release| x86 .Build .0 = Release| Win32
810- {8FF1B014-EB8A-4164-B20B-24582BCCC979} .Debug| x64 .ActiveCfg = Debug| x64
811- {8FF1B014-EB8A-4164-B20B-24582BCCC979} .Debug| x64 .Build .0 = Debug| x64
812- {8FF1B014-EB8A-4164-B20B-24582BCCC979} .Debug| x86 .ActiveCfg = Debug| Win32
813- {8FF1B014-EB8A-4164-B20B-24582BCCC979} .Debug| x86 .Build .0 = Debug| Win32
814- {8FF1B014-EB8A-4164-B20B-24582BCCC979} .Release| x64 .ActiveCfg = Release| x64
815- {8FF1B014-EB8A-4164-B20B-24582BCCC979} .Release| x64 .Build .0 = Release| x64
816- {8FF1B014-EB8A-4164-B20B-24582BCCC979} .Release| x86 .ActiveCfg = Release| Win32
817- {8FF1B014-EB8A-4164-B20B-24582BCCC979} .Release| x86 .Build .0 = Release| Win32
818- {69BD961D-0752-41D4-B491-75C7D247F614} .Debug| x64 .ActiveCfg = Debug| x64
819- {69BD961D-0752-41D4-B491-75C7D247F614} .Debug| x64 .Build .0 = Debug| x64
820- {69BD961D-0752-41D4-B491-75C7D247F614} .Debug| x86 .ActiveCfg = Debug| Win32
821- {69BD961D-0752-41D4-B491-75C7D247F614} .Debug| x86 .Build .0 = Debug| Win32
822- {69BD961D-0752-41D4-B491-75C7D247F614} .Release| x64 .ActiveCfg = Release| x64
823- {69BD961D-0752-41D4-B491-75C7D247F614} .Release| x64 .Build .0 = Release| x64
824- {69BD961D-0752-41D4-B491-75C7D247F614} .Release| x86 .ActiveCfg = Release| Win32
825- {69BD961D-0752-41D4-B491-75C7D247F614} .Release| x86 .Build .0 = Release| Win32
826- {B4F70D33-3252-4539-B8C7-2886F6DCD71C} .Debug| x64 .ActiveCfg = Debug| x64
827- {B4F70D33-3252-4539-B8C7-2886F6DCD71C} .Debug| x64 .Build .0 = Debug| x64
828- {B4F70D33-3252-4539-B8C7-2886F6DCD71C} .Debug| x86 .ActiveCfg = Debug| Win32
829- {B4F70D33-3252-4539-B8C7-2886F6DCD71C} .Debug| x86 .Build .0 = Debug| Win32
830- {B4F70D33-3252-4539-B8C7-2886F6DCD71C} .Release| x64 .ActiveCfg = Release| x64
831- {B4F70D33-3252-4539-B8C7-2886F6DCD71C} .Release| x64 .Build .0 = Release| x64
832- {B4F70D33-3252-4539-B8C7-2886F6DCD71C} .Release| x86 .ActiveCfg = Release| Win32
833- {B4F70D33-3252-4539-B8C7-2886F6DCD71C} .Release| x86 .Build .0 = Release| Win32
834- {77FAB774-596B-4DA6-966A-933FFECC07D3} .Debug| x64 .ActiveCfg = Debug| x64
835- {77FAB774-596B-4DA6-966A-933FFECC07D3} .Debug| x64 .Build .0 = Debug| x64
836- {77FAB774-596B-4DA6-966A-933FFECC07D3} .Debug| x86 .ActiveCfg = Debug| Win32
837- {77FAB774-596B-4DA6-966A-933FFECC07D3} .Debug| x86 .Build .0 = Debug| Win32
838- {77FAB774-596B-4DA6-966A-933FFECC07D3} .Release| x64 .ActiveCfg = Release| x64
839- {77FAB774-596B-4DA6-966A-933FFECC07D3} .Release| x64 .Build .0 = Release| x64
840- {77FAB774-596B-4DA6-966A-933FFECC07D3} .Release| x86 .ActiveCfg = Release| Win32
841- {77FAB774-596B-4DA6-966A-933FFECC07D3} .Release| x86 .Build .0 = Release| Win32
842- {1682E5C6-C9ED-4FF4-BC9C-76979901F5C2} .Debug| x64 .ActiveCfg = Debug| x64
843- {1682E5C6-C9ED-4FF4-BC9C-76979901F5C2} .Debug| x64 .Build .0 = Debug| x64
844- {1682E5C6-C9ED-4FF4-BC9C-76979901F5C2} .Debug| x86 .ActiveCfg = Debug| Win32
845- {1682E5C6-C9ED-4FF4-BC9C-76979901F5C2} .Debug| x86 .Build .0 = Debug| Win32
846- {1682E5C6-C9ED-4FF4-BC9C-76979901F5C2} .Release| x64 .ActiveCfg = Release| x64
847- {1682E5C6-C9ED-4FF4-BC9C-76979901F5C2} .Release| x64 .Build .0 = Release| x64
848- {1682E5C6-C9ED-4FF4-BC9C-76979901F5C2} .Release| x86 .ActiveCfg = Release| Win32
849- {1682E5C6-C9ED-4FF4-BC9C-76979901F5C2} .Release| x86 .Build .0 = Release| Win32
850- {55F8FCA7-011E-41FC-B99D-235748B6C054} .Debug| x64 .ActiveCfg = Debug| x64
851- {55F8FCA7-011E-41FC-B99D-235748B6C054} .Debug| x64 .Build .0 = Debug| x64
852- {55F8FCA7-011E-41FC-B99D-235748B6C054} .Debug| x86 .ActiveCfg = Debug| Win32
853- {55F8FCA7-011E-41FC-B99D-235748B6C054} .Debug| x86 .Build .0 = Debug| Win32
854- {55F8FCA7-011E-41FC-B99D-235748B6C054} .Release| x64 .ActiveCfg = Release| x64
855- {55F8FCA7-011E-41FC-B99D-235748B6C054} .Release| x64 .Build .0 = Release| x64
856- {55F8FCA7-011E-41FC-B99D-235748B6C054} .Release| x86 .ActiveCfg = Release| Win32
857- {55F8FCA7-011E-41FC-B99D-235748B6C054} .Release| x86 .Build .0 = Release| Win32
858- >>>>>>> 2 b 0917068215 ce 4 c 2 ac 95662 fe 7 a 23 e 88 c 7 add 4 f
859780 EndGlobalSection
860781 GlobalSection (SolutionProperties ) = preSolution
861782 HideSolutionNode = FALSE
0 commit comments