Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix conflict (AUD-621) #13

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Fix conflict (AUD-621) #13

wants to merge 15 commits into from

Commits on Apr 28, 2018

  1. add ac101 codec

    aithinker committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    a07c242 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2018

  1. fix conflict

    aithinker committed May 5, 2018
    Configuration menu
    Copy the full SHA
    24a973a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from donny681/aithinker_ac101 

    Aithinker ac101
    @donny681
    donny681 authored May 5, 2018
    Configuration menu
    Copy the full SHA
    e87044c View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2018

  1. nothing

    aithinker committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    05639c4 View commit details
    Browse the repository at this point in the history

  2. nothing

    aithinker committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    38a86fe View commit details
    Browse the repository at this point in the history

  3. fix esp-idf

    aithinker committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    640af5f View commit details
    Browse the repository at this point in the history

  4. update

    aithinker committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    5a51ebc View commit details
    Browse the repository at this point in the history

  5. delete build

    aithinker committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    4e5070f View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2018

  1. fix

    aithinker committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    66add71 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2018

  1. l&r

    aithinker committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    172a2f8 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2018

  1. fix mic2 recode voice too low

    aithinker committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    e3e1f28 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2018

  1. Merge pull request #4 from DanielLiMing/master 

    fix mic2 voice
    @donny681
    donny681 authored Jul 28, 2018
    Configuration menu
    Copy the full SHA
    a37e5ac View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2018

  1. sync spk and earphone

    aithinker committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    dbd5096 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. fix android phone bt from esp

    aithinker committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    b67175c View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2018

  1. Merge pull request #5 from DanielLiMing/master 

    Android 蓝牙
    @donny681
    donny681 authored Sep 7, 2018
    Configuration menu
    Copy the full SHA
    9a16c63 View commit details
    Browse the repository at this point in the history