Index: projects/openssl111/contrib/dma =================================================================== --- projects/openssl111/contrib/dma (revision 339257) +++ projects/openssl111/contrib/dma (revision 339258) Property changes on: projects/openssl111/contrib/dma ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/dma:r339246 Index: projects/openssl111/contrib/libevent =================================================================== --- projects/openssl111/contrib/libevent (revision 339257) +++ projects/openssl111/contrib/libevent (revision 339258) Property changes on: projects/openssl111/contrib/libevent ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libevent:r339254