← Back to branch summary

~vcs-imports/denemo/trunk

Viewing all changes in revision 3066.3.67.

  • Committer: Dominic Sacré
  • Date: 2011-07-24 21:51:37 UTC
  • mfrom: (3291)
  • mto: (3066.5.2)
  • mto: This revision was merged to the branch mainline in revision 3719.
  • Revision ID: git-v1:19f98853eed28e15edaef8416597e7f31ad536b5
Merge branch 'master' into soc

Conflicts:
        src/Makefile.am
        src/fluid.c
        src/main.c
        src/midi.c
        src/midi.h
        src/prefdialog.c
        src/view.c

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: