Index: projects/openssl111/contrib/serf =================================================================== --- projects/openssl111/contrib/serf (revision 339256) +++ projects/openssl111/contrib/serf (revision 339257) Property changes on: projects/openssl111/contrib/serf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,2 ## Merged /head/contrib/serf:r339256 Merged /vendor/serf/dist:r286503-339225,339227-339246 Index: projects/openssl111 =================================================================== --- projects/openssl111 (revision 339256) +++ projects/openssl111 (revision 339257) Property changes on: projects/openssl111 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r339256