{"shas":[["d7edb582ced513bc4225d50e675e9696552b9ab1","c05ca08f698bdd67c21ae2469dda2f00ffd51c2f@deepdarc.com","Merge branch 'master' of git://contiki.git.sourceforge.net/gitroot/contiki/contiki\n\nConflicts:\n\texamples/ravenusbstick/cdc_task.c\n\texamples/ravenusbstick/sicslow_ethernet.c\n\tplatform/avr-ravenusb/contiki-conf.h\n\tplatform/avr-ravenusb/contiki-raven-main.c","Robert Quattlebaum"],["376fafbac86eb756a4befc58cd3e4e1b4bcde686","c05ca08f698bdd67c21ae2469dda2f00ffd51c2f@deepdarc.com","Moved the start of the cdc_process to examples/ravenusbstick","Robert Quattlebaum"],["f865771bfcfb7852c0701c90b84a9f383340dfd5","c05ca08f698bdd67c21ae2469dda2f00ffd51c2f@deepdarc.com","Merge branch 'avr-ravenusb' into sandbox5","Robert Quattlebaum"]],"repo":"darconeous/contiki-2.x","actor":"darconeous","ref":"refs/heads/master","size":3,"head":"f865771bfcfb7852c0701c90b84a9f383340dfd5","actor_gravatar":"861d94130a5df1ccecc030c7157b8bed","push_id":27472668}