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, 9 insertions, 0 deletions
diff --git a/firmware/target/hosted/alsa-controls.h b/firmware/target/hosted/alsa-controls.h
index 870797c5b8..a08fc46e14 100644
--- a/firmware/target/hosted/alsa-controls.h
+++ b/firmware/target/hosted/alsa-controls.h
@@ -1,10 +1,19 @@
1/*************************************************************************** 1/***************************************************************************
2<<<<<<< 9a9c7f2b7c63a9db203084a3485988c07f17b86c
2 * __________ __ ___. 3 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___ 4 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / 5 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < 6 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ 7 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/ 8 * \/ \/ \/ \/ \/
9=======
10 * __________ __ ___.
11 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
12 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
13 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
14 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
15 * \/ \/ \/ \/ \/
16>>>>>>> Agptek rocker port initial commit
8 * 17 *
9 * Copyright (C) 2016 Amaury Pouly 18 * Copyright (C) 2016 Amaury Pouly
10 * 19 *