[Resound-svn] SF.net SVN: resound: [154]

[<res...@li...>]

Revision: 154
          http://resound.svn.sourceforge.net/resound/?rev=154&view=rev
Author:   jamoo1980
Date:     2008-05-17 06:34:10 -0700 (Sat, 17 May 2008)

Log Message:
-----------
Manual merge from trunk to branch 0.1.104 complete. At this revision there should be no functional difference between trunk and branch 0.1.104. (Difference is that trunk has GUI library-ised pending testing). Also added diagram to docs folder on trunk to help with parallel branch development until library-ised version is fully tested.

Modified Paths:
--------------
    branches/resound-0.1.104/src/resound_gui/base.cpp
    branches/resound-0.1.104/src/resound_gui/performanceview.cpp
    trunk/docs/CONTENTS.txt

Added Paths:
-----------
    trunk/docs/resound-svn-diagram-v0.1.n.svg


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.