lp:lmms

Created by DNS on 2011-09-24 and last modified on 2014-03-26
Get this branch:
bzr branch lp:lmms

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
RBOSE VCS Imports
Project:
LMMS
Status:
Development

Import details

Import Status: Suspended

This branch is an import of the HEAD branch of the Git repository at https://github.com/LMMS/lmms.git,branch=master.

Last successful import was on 2014-03-27.

Import started on 2014-03-28 on pear and finished on 2014-03-28 taking 1 minute — see the log
Import started on 2014-03-28 on pear and finished on 2014-03-28 taking 1 minute — see the log
Import started on 2014-03-27 on pear and finished on 2014-03-27 taking 50 seconds — see the log
Import started on 2014-03-27 on galapagos and finished on 2014-03-27 taking 2 minutes — see the log

Recent revisions

2569. By Tobias Junghans on 2014-03-26

Merge pull request #513 from diizy/wavetablesynth

Wavetablesynth

2568. By Tobias Junghans on 2014-03-26

Merge branch 'master' of github.com:LMMS/lmms

2567. By Tobias Junghans on 2014-03-26

NotePlayHandle, InstrumentFunctions: reworked stacking and arpeggio handling

Instead of having various flags for realizing the arpeggion functionality
use a more generic approach here using the recently introduced "origin"
property.

2566. By Tobias Junghans on 2014-03-26

Merge remote-tracking branch 'origin/stable-0.4-new-fx-mixer'

Conflicts:
 include/PlayHandle.h
 src/core/FxMixer.cpp
 src/core/Mixer.cpp
 src/gui/FxMixerView.cpp
 src/tracks/InstrumentTrack.cpp

2565. By Tobias Junghans on 2014-03-26

Merge branch 'stable-1.0'

2564. By Tobias Junghans on 2014-03-24

Merge remote-tracking branch 'origin/stable-0.4-undo-redo'

Conflicts:
 include/AutomatableModel.h
 include/MidiPort.h
 include/TrackContainerView.h
 include/surround_area.h
 include/track.h
 src/core/AutomatableModel.cpp
 src/core/TrackContainer.cpp
 src/core/note.cpp
 src/core/track.cpp
 src/gui/PianoRoll.cpp
 src/gui/TrackContainerView.cpp
 src/gui/widgets/LcdSpinBox.cpp

2563. By Tobias Junghans on 2014-03-24

ComboBoxModel: coding style fixes

2562. By Tobias Junghans on 2014-03-24

AutomatableModel: always fit value from linked model

When using value from linked model, make sure to fit it into own range
as otherwise this can cause out-of-boundary accesses e.g. in ComboBoxModel.

Closes #505.

2561. By Tobias Junghans on 2014-03-24

Merge pull request #507 from diizy/stable-0.4

Compat code to make LMMS compile on Qt <4.8

2560. By Tobias Junghans on 2014-03-23

Made 1.0.0 release

After almost exactly 10 years of development, we proudly bump the version
number to 1.0.0.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.