| commit | 1fa7fefdfe16d769dfa86b7d71be874a98f85e1b | |
| author | Markus Schmidt <schmidt@boomshop.net> | |
| Sat, 30 May 2015 01:28:07 +0000 (30 03:28 +0200) | ||
| committer | Markus Schmidt <schmidt@boomshop.net> | |
| Sat, 30 May 2015 01:28:07 +0000 (30 03:28 +0200) | ||
| tree | e0a09fceae70849f152cc79b8af00fd5a1f51c8c | treesnapshot (tar.gz zip) |
| parent | 9c4abb5455df4d543b82b16d9f629dcf334f5423 | commitdiff |
| parent | 6530581ae634a1809a445cf0458a1c7255c0c734 | commitdiff |
Merge branch 'design'
Conflicts:
src/modules_pitch.cpp
Conflicts:
src/modules_pitch.cpp
| src/modules_pitch.cpp | diff1 | diff2 | blobhistory |