Fix merge

git-svn-id: file:///home/awy/mirror/slim/7.6/trunk/server@32673 62299810-d8cb-41fd-93b7-d32162e5a4a4
LMS-Community · Jul 11, 2011 · f36c665 · f36c665
1 parent 6d06fdd
commit f36c665
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 0 deletions.
diff --git a/Firmware/boom_54.bin b/Firmware/boom_54.bin
diff --git a/Firmware/receiver_69.bin b/Firmware/receiver_69.bin
diff --git a/Firmware/squeezebox2_134.bin b/Firmware/squeezebox2_134.bin
diff --git a/Firmware/transporter_84.bin b/Firmware/transporter_84.bin