diff options
| author | Marcin Bukat <marcin.bukat@gmail.com> | 2017-04-27 11:36:40 +0200 |
|---|---|---|
| committer | Marcin Bukat <marcin.bukat@gmail.com> | 2018-06-12 10:31:14 +0200 |
| commit | d55680993df9b6743506814d98b5cc1859828f8a (patch) | |
| tree | 054dc45425fa1a6863f154b484036f26cc3ac13f /firmware/target/hosted/alsa-controls.h | |
| parent | beef52c5f0832e2c36bb1523b51eb8721f851db5 (diff) | |
| download | rockbox-d55680993df9b6743506814d98b5cc1859828f8a.tar.gz rockbox-d55680993df9b6743506814d98b5cc1859828f8a.zip | |
Agptek Rocker: Initial commit
Change-Id: I26b51106c7b1c36a603fba6d521e917d79b5a95b
Diffstat (limited to 'firmware/target/hosted/alsa-controls.h')
| -rw-r--r-- | firmware/target/hosted/alsa-controls.h | 9 |
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 @@ /*************************************************************************** +<<<<<<< 9a9c7f2b7c63a9db203084a3485988c07f17b86c * __________ __ ___. * Open \______ \ ____ ____ | | _\_ |__ _______ ___ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * \/ \/ \/ \/ \/ +======= + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ +>>>>>>> Agptek rocker port initial commit * * Copyright (C) 2016 Amaury Pouly * |