Merge lp://staging/harmonyseq into lp://staging/harmonyseq/stable

Proposed by Rafał Cieślak
Status: Merged
Merged at revision: 694
Proposed branch: lp://staging/harmonyseq
Merge into: lp://staging/harmonyseq/stable
Diff against target: 112225 lines (+103311/-4559)
56 files modified
Makefile.am (+6/-1)
Makefile.in (+7/-1)
README (+1/-1)
configure (+11/-4)
configure.ac (+6/-4)
examples/Makefile.am (+2/-2)
examples/Makefile.in (+2/-2)
examples/README (+8/-20)
examples/big_0.12.hseq (+0/-1378)
examples/chasm_0.13.hseq (+0/-112)
examples/chordexample_0.11.hseq (+0/-201)
examples/complexity_0.11.hseq (+0/-145)
examples/example_0.10.hseq (+0/-101)
examples/guitar_demo_0.11.hseq (+0/-245)
examples/mesosphere_0.12.hseq (+0/-278)
examples/michas_sonata_0.11.hseq (+0/-122)
examples/selfcontrol_demo_0.11.hseq (+0/-98)
examples/shoreless_two_0.15.hseq (+41/-17)
examples/trioles.h2song (+1475/-0)
examples/trioles.hseq (+275/-0)
examples/trioles.xmz (+100154/-0)
examples/tron2_0.13.hseq (+0/-346)
harmonyseq.desktop.in (+3/-3)
locale/templates/harmonySEQ.pot (+0/-400)
nbproject/configurations.xml (+1/-1)
nbproject/private/configurations.xml (+2/-7)
pixmaps/Makefile.am (+1/-1)
pixmaps/Makefile.in (+1/-1)
po/de.po (+105/-103)
po/en.po (+99/-95)
po/en_GB.po (+116/-116)
po/eo.po (+90/-82)
po/harmonySEQ.pot (+87/-79)
po/ja.po (+426/-311)
po/pl.po (+117/-115)
po/tr.po (+99/-95)
src/Action.cpp (+3/-2)
src/ActionGUI.cpp (+2/-1)
src/AtomContainer.h (+2/-2)
src/Configuration.cpp (+33/-3)
src/Configuration.h (+7/-1)
src/MainWindow.cpp (+6/-6)
src/MainWindow.h (+1/-1)
src/Makefile.am (+2/-2)
src/Makefile.in (+2/-2)
src/MidiDriver.cpp (+32/-31)
src/PatternWidget.cpp (+8/-8)
src/PatternWidget.h (+1/-1)
src/Sequencer.cpp (+7/-1)
src/Sequencer.h (+1/-1)
src/SequencerWidget.cpp (+35/-3)
src/SequencerWidget.h (+6/-0)
src/SettingsWindow.cpp (+1/-1)
src/SettingsWindow.h (+1/-1)
src/config.h.in (+3/-0)
src/main.cpp (+23/-5)
To merge this branch: bzr merge lp://staging/harmonyseq
Reviewer Review Type Date Requested Status
Rafał Cieślak Approve
Review via email: mp+91546@code.staging.launchpad.net

Commit message

Merge from trunk - new stable version - 0.16

Description of the change

Merge into stable for releasing 0.16.

To post a comment you must log in.
Revision history for this message
Rafał Cieślak (rafalcieslak256) wrote :

Approving to release 0.16.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: