Author: sergeyb Date: Fri Jan 25 13:17:44 2013 New Revision: 1438493 URL: http://svn.apache.org/viewvc?rev=1438493&view=rev Log: Merged revisions 1438489 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1438489 | sergeyb | 2013-01-25 13:15:09 +0000 (Fri, 25 Jan 2013) | 9 lines Merged revisions 1438488 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1438488 | sergeyb | 2013-01-25 13:13:14 +0000 (Fri, 25 Jan 2013) | 1 line Adding a mising file ........ ................ Added: cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/Nonce.java - copied unchanged from r1438489, cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/mac/Nonce.java Modified: cxf/branches/2.6.x-fixes/ (props changed) Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1438489 Merged /cxf/trunk:r1438488 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available.
