| commit | b595e7cb534d9d044b5149dfcf0ac1d4cae9a623 | [log] [tgz] |
|---|---|---|
| author | Christina Quast <chrysh.ng+git@gmail.com> | Sun Apr 12 13:31:01 2015 +0200 |
| committer | Christina Quast <chrysh.ng+git@gmail.com> | Sun Apr 12 13:31:01 2015 +0200 |
| tree | 6a63127ada4d520a75e2964f1513bf141417228d | |
| parent | 2b8a18bf3a053496360c24e4080345f03d0498d9 [diff] | |
| parent | e24b9ace89cb21ebcbadb54fce83dd2827a2480e [diff] |
Merge branch 'new_iso_init' (sniffer not working) Conflicts: firmware/src_simtrace/phone.c firmware/src_simtrace/simtrace.h