Author: svn-role
Date: Thu Nov 20 04:01:03 2014
New Revision: 1640662
URL: http://svn.apache.org/r1640662
Log:
Merge the r1542610 group from trunk:
* r1542610, r1564576, r1568180
Add missing description to build.conf, to properly generate a version
resource (including icon) for this executable on Windows.
Notes:
r1564576 breaks compilation on Visual Studio 2010, 2012 and 2013 of
this project. r1568180 fixes this problem.
Votes:
+1: rhuijben, breser, stefan2
+1: (without r1564576, r1568180): stsp
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/build.conf
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1542610,1564576,1568180
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1640662&r1=1640661&r2=1640662&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Nov 20 04:01:03 2014
@@ -147,16 +147,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1542610, r1564576, r1568180
- Add missing description to build.conf, to properly generate a version
- resource (including icon) for this executable on Windows.
- Notes:
- r1564576 breaks compilation on Visual Studio 2010, 2012 and 2013 of
- this project. r1568180 fixes this problem.
- Votes:
- +1: rhuijben, breser, stefan2
- +1: (without r1564576, r1568180): stsp
-
* r1600331, r1600348, 1600368, r1600563, r1600781
Improve gpg-agent support.
Justification: Avoids spurious error logs, supports standard socket
Modified: subversion/branches/1.8.x/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/build.conf?rev=1640662&r1=1640661&r2=1640662&view=diff
==============================================================================
--- subversion/branches/1.8.x/build.conf (original)
+++ subversion/branches/1.8.x/build.conf Thu Nov 20 04:01:03 2014
@@ -1357,6 +1357,7 @@ install = tools
libs = libsvn_repos libsvn_fs libsvn_subr apr
[svn-populate-node-origins-index]
+description = Tool to populate the node origins index of a repository
type = exe
path = tools/server-side
sources = svn-populate-node-origins-index.c
