summaryrefslogtreecommitdiff
path: root/firmware/target/hosted/alsa-controls.h
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/hosted/alsa-controls.h')
-rw-r--r--firmware/target/hosted/alsa-controls.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/firmware/target/hosted/alsa-controls.h b/firmware/target/hosted/alsa-controls.h
index a08fc46e14..0505ee3dd1 100644
--- a/firmware/target/hosted/alsa-controls.h
+++ b/firmware/target/hosted/alsa-controls.h
@@ -1,19 +1,10 @@
1/*************************************************************************** 1/***************************************************************************
2<<<<<<< 9a9c7f2b7c63a9db203084a3485988c07f17b86c
3 * __________ __ ___.
4 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
5 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
6 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
7 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
8 * \/ \/ \/ \/ \/
9=======
10 * __________ __ ___. 2 * __________ __ ___.
11 * Open \______ \ ____ ____ | | _\_ |__ _______ ___ 3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
12 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / 4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
13 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < 5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
14 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ 6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
15 * \/ \/ \/ \/ \/ 7 * \/ \/ \/ \/ \/
16>>>>>>> Agptek rocker port initial commit
17 * 8 *
18 * Copyright (C) 2016 Amaury Pouly 9 * Copyright (C) 2016 Amaury Pouly
19 * 10 *