[llvm-branch-commits] [cfe-branch] r195725 - Merging r195420:

[Bill Wendling]

Author: void
Date: Tue Nov 26 04:24:12 2013
New Revision: 195725

URL: http://llvm.org/viewvc/llvm-project?rev=195725&view=rev
Log:
Merging r195420:
------------------------------------------------------------------------
r195420 | alp | 2013-11-22 00:00:20 -0800 (Fri, 22 Nov 2013) | 6 lines

Add txt file extension to VS solution's README

This matches other README.txt files in LLVM and makes things more obvious on
Windows where it's likely to be read. CRLFs are retained for the same reason.

Also fix Visual Studio product name.
------------------------------------------------------------------------

Added:
    cfe/branches/release_34/tools/clang-format-vs/README.txt
      - copied unchanged from r195420, cfe/trunk/tools/clang-format-vs/README.txt
Removed:
    cfe/branches/release_34/tools/clang-format-vs/README
Modified:
    cfe/branches/release_34/   (props changed)

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 26 04:24:12 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195326,195329,195367,195384,195501,195547,195556,195558,195587,195620,195687,195710
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195326,195329,195367,195384,195420,195501,195547,195556,195558,195587,195620,195687,195710
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Removed: cfe/branches/release_34/tools/clang-format-vs/README
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/tools/clang-format-vs/README?rev=195724&view=auto
==============================================================================
--- cfe/branches/release_34/tools/clang-format-vs/README (original)
+++ cfe/branches/release_34/tools/clang-format-vs/README (removed)
@@ -1,6 +0,0 @@
-This directory contains a VSPackage project to generate a visual studio extension
-for clang-format.
-
-Build prerequisites are:
-- Visual Studio 2012 Professional
-- Visual Studio SDK (http://www.microsoft.com/en-us/download/details.aspx?id=30668)
\ No newline at end of file