diff options
| author | Johannes Schickel | 2013-01-26 14:00:04 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2013-01-26 14:00:04 +0100 |
| commit | 94edb3409fa949a6391c54adb4bf7fc4a1d210ad (patch) | |
| tree | a5b93cc6a9d2f323460684c9588e97709397cc94 /.gitignore | |
| parent | 3b77a97b404dd423005ae1a3545ca028c48f3f01 (diff) | |
| parent | e4a77aff06645a76b575aaf4b8253760e0cd3710 (diff) | |
| download | scummvm-rg350-94edb3409fa949a6391c54adb4bf7fc4a1d210ad.tar.gz scummvm-rg350-94edb3409fa949a6391c54adb4bf7fc4a1d210ad.tar.bz2 scummvm-rg350-94edb3409fa949a6391c54adb4bf7fc4a1d210ad.zip | |
Merge branch 'eriktorbjorn-fluidsynth-settings'
This is a manual merge of a slightly adapted pull request #296.
The changes made are:
- Each time the theme format changes, the version was increased
- default.inc has been regenerated in the same commit as the theme changes
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions