Public Git Hosting - cerebrum.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 3e1fbb3 a91237c)

commit	7b4a85f5209aac3f43729f64821f24549d286e63
author	jaseg <s@jaseg.de>
	Fri, 13 Jul 2012 21:27:28 +0000 (13 21:27 +0000)
committer	jaseg <s@jaseg.de>
	Fri, 13 Jul 2012 21:27:28 +0000 (13 21:27 +0000)
tree	bde135faabdb680fc260e8311731fcbd9256be0c	tree \| snapshot (tar.gz zip)
parent	3e1fbb36a61b5c1844a59081d83d672ac51bb7e8	commit \| diff
parent	a91237cab1077b0fa685dc23d986dd051f44a0cc	commit \| diff

Merge remote-tracking branch 'origin/master'
Added config.h to the gitignore file

Conflicts:
config.h

.gitignore	diff1 \|	diff2 \|	blob \| history
cerebrum_firmware.c	diff1 \|	diff2 \|	blob \| history

RPC framework for interaction with c firmware from python host applications