[Lmuse-cvs-traffic] SF.net SVN: lmuse:[1575] branches/infrastruct_1_poc/muse2

[<ter...@us...>]

Revision: 1575
          http://lmuse.svn.sourceforge.net/lmuse/?rev=1575&view=rev
Author:   terminator356
Date:     2012-08-04 02:36:14 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
Merge from current trunk.

Modified Paths:
--------------
    branches/infrastruct_1_poc/muse2/ChangeLog
    branches/infrastruct_1_poc/muse2/doc/documentation.tex
    branches/infrastruct_1_poc/muse2/muse/arranger/arrangerview.cpp
    branches/infrastruct_1_poc/muse2/muse/audiotrack.cpp
    branches/infrastruct_1_poc/muse2/muse/ctrl.cpp
    branches/infrastruct_1_poc/muse2/muse/ctrl.h
    branches/infrastruct_1_poc/muse2/muse/instruments/editinstrument.cpp
    branches/infrastruct_1_poc/muse2/muse/instruments/editinstrument.h
    branches/infrastruct_1_poc/muse2/muse/instruments/editinstrumentbase.ui
    branches/infrastruct_1_poc/muse2/muse/instruments/minstrument.cpp
    branches/infrastruct_1_poc/muse2/muse/instruments/minstrument.h
    branches/infrastruct_1_poc/muse2/muse/midiedit/drumedit.cpp
    branches/infrastruct_1_poc/muse2/share/instruments/gm.idf
    branches/infrastruct_1_poc/muse2/share/instruments/gs.idf
    branches/infrastruct_1_poc/muse2/share/instruments/xg.idf

Added Paths:
-----------
    branches/infrastruct_1_poc/muse2/doc/pics/main_window_with_automation.png
    branches/infrastruct_1_poc/muse2/doc/pics/main_window_with_midi_automation.png
    branches/infrastruct_1_poc/muse2/doc/pics/main_window_with_midi_editor_vam.png
    branches/infrastruct_1_poc/muse2/doc/pics/midi_config_window.png
    branches/infrastruct_1_poc/muse2/doc/pics/midi_routing_matrix.png
    branches/infrastruct_1_poc/muse2/doc/pics/soloing_window.png
    branches/infrastruct_1_poc/muse2/doc/pics/vam_synth.png

Property Changed:
----------------
    branches/infrastruct_1_poc/muse2/

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