← Back to branch summary

~kevang/mnemosyne-proj/grade-shortcuts-improvements

~kevang/mnemosyne-proj/grade-shortcuts-improvements

« back to all changes in this revision

Viewing changes to mnemosyne/tests/files/to_merge.db

Committer: Peter.Bienstman at UGent
Date: 2015-01-23 19:47:11 UTC
Revision ID: peter.bienstman@ugent.be-20150123194711-wbof2sllr0dq89tr

Merge card appearance.

files added:
mnemosyne/tests/files/basedir_to_merge

mnemosyne/tests/files/basedir_to_merge/config.db

mnemosyne/tests/files/basedir_to_merge/machine.id

mnemosyne/tests/files/basedir_to_merge/to_merge.db

mnemosyne/tests/files/basedir_to_merge/to_merge.db_media

files removed:
mnemosyne/tests/files/to_merge.db

files modified:
mnemosyne.wpu

mnemosyne/TODO

mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_db.py

mnemosyne/tests/test_db_import.py

Show diffs side-by-side

added added

removed removed

mnemosyne/tests/files/to_merge.db

Older »