# HG changeset patch # User Michael Terrell # Date 1381135502 -3600 # Node ID d29e51dee45a6fa843d5cc81d3ca89c3f83ec38b # Parent 83e76c49cde315dfdb7d5a7b033ee4ed3ff49550# Parent dead657aaa44ea29d3eaf53238a450ac31babf40 Merged diff -r dead657aaa44 -r d29e51dee45a Lectures/.DS_Store Binary file Lectures/.DS_Store has changed diff -r dead657aaa44 -r d29e51dee45a Lectures/Lec2 - Microphones/.DS_Store Binary file Lectures/Lec2 - Microphones/.DS_Store has changed