tree 6a63127ada4d520a75e2964f1513bf141417228d
parent 2b8a18bf3a053496360c24e4080345f03d0498d9
parent e24b9ace89cb21ebcbadb54fce83dd2827a2480e
author Christina Quast <chrysh.ng+git@gmail.com> 1428838261 +0200
committer Christina Quast <chrysh.ng+git@gmail.com> 1428838261 +0200

Merge branch 'new_iso_init' (sniffer not working)

Conflicts:
	firmware/src_simtrace/phone.c
	firmware/src_simtrace/simtrace.h