2024-02-08 03:27:49 +01:00
|
|
|
<<<<<<< HEAD
|
2024-01-11 17:57:31 +01:00
|
|
|
PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.36.32532:TargetPlatformVersion=10.0.22621.0:
|
2024-02-07 18:32:04 +01:00
|
|
|
Release|Win32|D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\|
|
2024-02-08 03:27:49 +01:00
|
|
|
=======
|
2024-02-07 19:55:04 +01:00
|
|
|
PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.22000.0:
|
|
|
|
|
Release|Win32|C:\Users\neryt\Grafika2023\PlanetCreator\|
|
2024-02-08 03:27:49 +01:00
|
|
|
>>>>>>> origin/merge_with_textures
|
