[asterisk-dev] [svn-commits] transnexus: branch 1.8 r338137 - /branches/1.8/apps/app_osplookup.c

[Paul Belanger]

On 11-09-28 03:27 AM, SVN commits to the Digium repositories wrote:
> Author: transnexus
> Date: Wed Sep 28 02:27:07 2011
> New Revision: 338137
>
> URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=338137
> Log:
> Updated for OSP Toolkit 4.0.0.
>
> Modified:
>      branches/1.8/apps/app_osplookup.c
>
Greetings,

It looks like you have committed some new features to Asterisk trunk, 
thanks.  However, they should not be merged into Asterisk 1.8, once a 
branch have been released new features should not be added.

Also, changes to configure.ac will require you to run the bootstrap.sh 
file located in the source directory.

If you do need to merge between branches, we have some svnmerge scripts 
in repotools[1] that needs to be used.  For more info, check out the 
wiki page[2].

Feel free to jump on #asterisk-dev (Freenode) if you need anymore help 
or questions.

[1] http://svn.asterisk.org/svn/repotools
[2] https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage

-- 
Paul Belanger
Digium, Inc. | Software Developer
twitter: pabelanger | IRC: pabelanger (Freenode)
Check us out at: http://digium.com & http://asterisk.org