diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:32:13 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:32:13 -0400 |
| commit | 8c9749e42faf7808034ed8b7afce4a2fe6dc6f33 (patch) | |
| tree | 823af8a96f4e0b2a404f5e52eadf4f46e1d10229 /libs/evoral/test | |
| parent | f6d29abfc75c460b9e35717f2907e4e61bf38058 (diff) | |
| parent | 08a1409b1f5b5558d2eccc28a3ae4cbd44391812 (diff) | |
merge with master and fix 4 conflicts by hand
Diffstat (limited to 'libs/evoral/test')
| -rw-r--r-- | libs/evoral/test/SequenceTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cpp index 69931b8e0d..6e07776fdb 100644 --- a/libs/evoral/test/SequenceTest.cpp +++ b/libs/evoral/test/SequenceTest.cpp @@ -23,7 +23,7 @@ SequenceTest::preserveEventOrderingTest () seq->start_write(); for (Notes::const_iterator i = test_notes.begin(); i != test_notes.end(); ++i) { - uint8_t buffer[2]; + uint8_t buffer[3]; Event<Time>* event = new Event<Time>( DummyTypeMap::CONTROL, (*i)->on_event().time(), 3, buffer, true ); |