[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone.visualc: 8d4e5b258f2346827e
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone.visualc: 8d4e5b258f2346827e2f43d88f1511bd2b3e4dc0 |
Date: |
Tue, 21 Dec 2010 04:28:15 GMT |
revision: 8d4e5b258f2346827e2f43d88f1511bd2b3e4dc0
date: 2010-12-21T04:27:33
author: Timothy Brownawell <address@hidden>
branch: net.venge.monotone.visualc
changelog:
merge of '43dd28b1ef37de2d46619844c17f9477f721726e'
and 'e0bebde63a53350843896982b0a4731366442f30'
manifest:
format_version "1"
new_manifest [d3f3c0c285f5b7b36ab88aa464cd9fdadc4fbcb1]
old_revision [43dd28b1ef37de2d46619844c17f9477f721726e]
patch "NEWS"
from [33e31a93f80491aec6987e71afba913a8878eab2]
to [7216d7870a01f5caaa0f309482d269d9345f3c38]
old_revision [e0bebde63a53350843896982b0a4731366442f30]
add_file "visualc/check_net.vcxproj"
content [0860ea6a0ee8ffacace4a1883a4153207f37c4b1]
add_file "visualc/check_net.vcxproj.filters"
content [6d00409f4802dc8cbdefc2cd5aa0d0c2224a0f00]
patch "visualc/monotone.sln"
from [312fa84b29e077861e6963bf120ee590a933c072]
to [0ed0048009de14ecf827adace2f8b53b41d21138]
============================================================
--- NEWS 33e31a93f80491aec6987e71afba913a8878eab2
+++ NEWS 7216d7870a01f5caaa0f309482d269d9345f3c38
@@ -4,6 +4,9 @@ XXX XXX XX XX:XX:XX UTC 2010
Changes
+ - The database scheme was changed; please execute 'mtn db migrate'
+ on all your local and remote databases.
+
- in 'mtn conflicts resolve_first interactive', the result
file name now defaults to _MTN/resolutions/<left_path>.
(fixes monotone issue 103)
============================================================
--- visualc/monotone.sln 312fa84b29e077861e6963bf120ee590a933c072
+++ visualc/monotone.sln 0ed0048009de14ecf827adace2f8b53b41d21138
@@ -19,6 +19,8 @@ EndProject
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libplatform", "libplatform.vcxproj", "{309B9A4E-2572-4A68-876D-E02639F84510}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "check_net", "check_net.vcxproj", "{7341FD73-D19D-4FBA-BA2D-26781C4A4C41}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -49,6 +51,10 @@ Global
{309B9A4E-2572-4A68-876D-E02639F84510}.Debug|Win32.Build.0 = Debug|Win32
{309B9A4E-2572-4A68-876D-E02639F84510}.Release|Win32.ActiveCfg = Release|Win32
{309B9A4E-2572-4A68-876D-E02639F84510}.Release|Win32.Build.0 = Release|Win32
+ {7341FD73-D19D-4FBA-BA2D-26781C4A4C41}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7341FD73-D19D-4FBA-BA2D-26781C4A4C41}.Debug|Win32.Build.0 = Debug|Win32
+ {7341FD73-D19D-4FBA-BA2D-26781C4A4C41}.Release|Win32.ActiveCfg = Release|Win32
+ {7341FD73-D19D-4FBA-BA2D-26781C4A4C41}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
============================================================
--- /dev/null
+++ visualc/check_net.vcxproj 0860ea6a0ee8ffacace4a1883a4153207f37c4b1
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{7341FD73-D19D-4FBA-BA2D-26781C4A4C41}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>check_net</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\win32\tester-check-net.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
============================================================
--- /dev/null
+++ visualc/check_net.vcxproj.filters 6d00409f4802dc8cbdefc2cd5aa0d0c2224a0f00
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\win32\tester-check-net.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone.visualc: 8d4e5b258f2346827e2f43d88f1511bd2b3e4dc0,
code <=