backup tgids
better hourly
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr
Conflicts:
.idea/workspace.xml
generateHourlys.php
group by category
better hourly record
date picker
Merge branch 'master' of ssh://maxious.lambdacomplex.org/git/scannr
move towards trunklog/categories
tgids
proper concat for hourlies
tgids table
select input
hourly/convo ffmpeg generrators
android client
idea ide updates
getfile and convo gen
graph date filter
parallelise serial port usage and I/O for writing sounds files
more osx fixes
add some pyaudio test files