aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Wilson <ksattic@gmail.com>2014-05-07 06:17:44 -0700
committerSimon Wilson <ksattic@gmail.com>2014-05-07 06:19:53 -0700
commitb5e7b91658baf8f27a1582efd63dd223f79e0e5d (patch)
treeb0623cf84d689e2b9d70bcf2f15b1acd063a32d6 /include
parent867920ca46cc8ddc726bc0d406c454c17b7b9262 (diff)
parent8b772cc507f4c3a3b2ce5ca8a2cebbc60d1fa684 (diff)
Merge branch 'master' of git://github.com/charleskeepax/tinyalsa into charleskeepax-master
Conflicts: tinymix.c
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions