Public Git Hosting - cerebrum.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 82e2bdd 032292b)

commit	9321e3609d3497c742a86136bcb100e3b756a570
author	jaseg <code@jaseg.net>
	Wed, 10 Dec 2014 20:22:39 +0000 (10 21:22 +0100)
committer	jaseg <code@jaseg.net>
	Wed, 10 Dec 2014 20:22:39 +0000 (10 21:22 +0100)
tree	d879fb9dea5ce6c9e3bb81434ca6779cd9ba74e6	tree \| snapshot (tar.gz zip)
parent	82e2bddfca1358820070d2f43e3e18cb6e60a82e	commit \| diff
parent	032292b3eb5a16a8a479c15abdbbcaee5e87cf69	commit \| diff

Merge branch 'master' of c-leuse:cerebrum

Conflicts:
configs/relays.json
tools/relays.py

pylibcerebrum/serial_mux.py	diff1 \|	diff2 \|	blob \| history
tools/relays.py	diff1 \|	diff2 \|	blob \| history

RPC framework for interaction with c firmware from python host applications