2024-10-17 14:50:42

2024-10-17 14:50:42 -03:00
parent 06454058f9
commit 7b20208632
3 changed files with 64 additions and 39 deletions
--- a/1/MAAC3113/In
+++ b/1/MAAC3113/In
@ -31,8 +31,6 @@
 	- Laser printers
 - MIDI facilitated the way devices speak to each other in regards to music information
 - Finale and Sibelius emerge as big notation software
-<<<<<<< HEAD
- Cloud based solutions emerge as competitors
 ## Acoustics
 - Frequency - Pitch (Hz)
 - Amplitude - Loudness (dB)
@ -44,7 +42,8 @@
 - Pitch (Musician Name)
 - Loudness (Musician Name)
 - Articulation
-=======
- Cloud based solutions emerge as compeditors
-
->>>>>>> 1f3607c (2024-10-07 13:32:37)
+- Cloud based solutions emerge as competitors
+## Sequencing
+- A device or software than can record, edit, or playback music
+- Early
+	- Resembled piano roll