Changeset 401 for branches/jackMidi/gui/src/SongEditor/SongEditor.cpp

Timestamp:

08/25/08 23:01:23 (5 years ago)

Author:

gabriel

Message:

Merge rev 373:374 from trunk.

Conflicts:

features.pri
libs/hydrogen/src/hydrogen.cpp

Files:

• branches/jackMidi/gui/src/SongEditor/SongEditor.cpp (modified) (1 diff)

branches/jackMidi/gui/src/SongEditor/SongEditor.cpp

@@ -32 +32 @@
 #include <hydrogen/audio_engine.h>
 #include <hydrogen/event_queue.h>
+#include <hydrogen/instrument.h>
 using namespace H2Core;