[asterisk-commits] mjordan: branch mjordan/cdrs-of-doom r386835 - in /team/mjordan/cdrs-of-doom:...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Mon Apr 29 06:31:46 2013
New Revision: 386835

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=386835
Log:
Resolve merge conflicts

Modified:
    team/mjordan/cdrs-of-doom/   (props changed)
    team/mjordan/cdrs-of-doom/include/asterisk/doxygen/commits.h

Propchange: team/mjordan/cdrs-of-doom/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mjordan/cdrs-of-doom/
------------------------------------------------------------------------------
--- cdrs-of-doom-integrated (original)
+++ cdrs-of-doom-integrated Mon Apr 29 06:31:46 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-386787
+/team/group/bridge_construction:1-386834

Modified: team/mjordan/cdrs-of-doom/include/asterisk/doxygen/commits.h
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/cdrs-of-doom/include/asterisk/doxygen/commits.h?view=diff&rev=386835&r1=386834&r2=386835
==============================================================================
--- team/mjordan/cdrs-of-doom/include/asterisk/doxygen/commits.h (original)
+++ team/mjordan/cdrs-of-doom/include/asterisk/doxygen/commits.h Mon Apr 29 06:31:46 2013
@@ -110,5 +110,5 @@
  *
  * For more detailed information about working with branches and merging,
  * see the following page on %asterisk.org:
- * \arg http://www.asterisk.org/developers/svn-branching-merging
+ * \arg https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage
  */