Alex Sadleir []
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr
Conflicts:
.idea/workspace.xml
generateHourlys.php
Alex Sadleir []
group by category
Maxious []
better hourly record
Maxious []
date picker
Maxious []
Merge branch 'master' of ssh://maxious.lambdacomplex.org/git/scannr
Maxious []
move towards trunklog/categories
Alex Sadleir []
tgids
Alex Sadleir []
proper concat for hourlies
Maxious []
tgids table
Alex Sadleir []
select input
Alex Sadleir []
hourly/convo ffmpeg generrators
Alex Sadleir []
android client
Alex Sadleir []
idea ide updates
Maxious []
getfile and convo gen
Maxious []
graph date filter
Alex Sadleir []
parallelise serial port usage and I/O for writing sounds files
Alex Sadleir []
more osx fixes
Alex Sadleir []
add some pyaudio test files
Alex Sadleir []
osx fixes
Maxious []
add pause
Maxious []
add gen convo
Maxious []
db update
Maxious []
add zooming to graph
Maxious []
fix viewcalls
Maxious []
add calllog
Maxious []
db fixes
Maxious []
html5 boiler plate
Maxious []
move files to data folder
Maxious []
phpstorm proj
Maxious []
add example db
Maxious []
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr
Conflicts:
.gitignore
Maxious []
gitnore
Maxious []
beginnings of view calls
Maxious []
netbeans metadata
Maxious []
Try to reduce runaway memory usaqe
Maxious []
database recording
Maxious []
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/scannr
Conflicts:
scannr.py
Maxious []
add serial port reading
Maxious []
add pynma and postgres
Maxious []
Ignore short silent clips
Maxious []
allocate filename when signal starts
Maxious []
initial commit