svn commit: r1712604 - in /subversion/branches/move-tracking-2/doc: doxygen.conf svn-square.jpg

[ju...@apache.org]

Author: julianfoad
Date: Wed Nov  4 18:20:33 2015
New Revision: 1712604

URL: http://svn.apache.org/viewvc?rev=1712604&view=rev
Log:
On the 'move-tracking-2' branch: Complete the merge committed in r1666947,
which tried to catch up with trunk@1666945 but missed the 'doc' subdirectory.

Since r1666947 the mergeinfo has wrongly indicated that these changes have
already been merged, so this commit does not alter the mergeinfo.

Added:
    subversion/branches/move-tracking-2/doc/svn-square.jpg
      - copied unchanged from r1663949, subversion/trunk/doc/svn-square.jpg
Modified:
    subversion/branches/move-tracking-2/doc/doxygen.conf

Modified: subversion/branches/move-tracking-2/doc/doxygen.conf
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/doc/doxygen.conf?rev=1712604&r1=1712603&r2=1712604&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/doc/doxygen.conf (original)
+++ subversion/branches/move-tracking-2/doc/doxygen.conf Wed Nov  4 18:20:33 2015
@@ -33,6 +33,13 @@ PROJECT_NAME           = Subversion
 
 PROJECT_NUMBER         =
 
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO = doc/svn-square.jpg
+
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
 # If a relative path is entered, it will be relative to the location