• mmaluschnig's avatar
    Merge branch 'mimemime' of https://altitude.otago.ac.nz/gstuitje/ringmaster into mimemime · a4b45621
    mmaluschnig authored
    * 'mimemime' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
      started work on the tarantella for mime mime.
    
    # Conflicts:
    #	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
    #	RingMaster/RingMaster/.vs/RingMaster/xs/sqlite3/storage.ide-shm
    #	RingMaster/RingMaster/.vs/RingMaster/xs/sqlite3/storage.ide-wal
    #	RingMaster/RingMaster/Assets/Sounds/Bushwick Tarantella (muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/DarxieLand (muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Fig Leaf Times Two (muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Fig Leaf Times Two.mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Fluffing a Duck (muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Fluffing a Duck.mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Gaslamp Funworks (muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Hyperfun (muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Hyperfun.mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Manic Polka (muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Manic Polka.mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Meatball Parade (muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/No Spam Polka (muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/Wagon Wheel (muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/daytime-background.mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/dvorak-polka-by-kevin-macleod(muffled).mp3.meta
    #	RingMaster/RingMaster/Assets/Sounds/glee-club-polka-by-kevin-macleod (muffled).mp3.meta
    a4b45621