git.osdn.net Git - openi2cradio/OpenI2CRadio.git/commit

(root) / openi2cradio / OpenI2CRadio.git / commit

author	K.Ohta <whatisthis.sowhat@gmail.com>
	Sat, 31 Aug 2013 11:25:40 +0000 (20:25 +0900)
committer	K.Ohta <whatisthis.sowhat@gmail.com>
	Sat, 31 Aug 2013 11:25:40 +0000 (20:25 +0900)
commit	6b50160e0e6c77667b4aca36ba756a1032160b9c
tree	308c9cd29e80ea7fd700750174ddf5a9ebd0e6c4	tree \| snapshot
parent	f293f4ec6b278530f97a20ab2c68fc8a440293e1	commit \| diff
parent	4c1f43368e7898c61b942060f0c5937c34cbc543	commit \| diff

Merge branch 'master' of git.sourceforge.jp:/gitroot/openi2cradio/OpenI2CRadio into stable_v1.0

Conflicts:
backlight.c
backlight.h
ioports.c
main.c
nbproject/Makefile-default.mk
nbproject/Makefile-genesis.properties
nbproject/configurations.xml

backlight.c	diff1 \|	diff2 \|	blob \| history
backlight.h	diff1 \|	diff2 \|	blob \| history
ioports.c	diff1 \|	diff2 \|	blob \| history
main.c	diff1 \|	diff2 \|	blob \| history
nbproject/Makefile-default.mk	diff1 \|	diff2 \|	blob \| history
nbproject/Makefile-genesis.properties	diff1 \|	diff2 \|	blob \| history
nbproject/configurations.xml	diff1 \|	diff2 \|	blob \| history
power.c	diff1 \|	diff2 \|	blob \| history

Manipulate I2C-Radio IC from PIC18Fxx.

RSS Atom

About OSDN

Find Software

Develop Software

Help

backlight.c	diff1 \|	diff2 \|	blob \| history
backlight.h	diff1 \|	diff2 \|	blob \| history
ioports.c	diff1 \|	diff2 \|	blob \| history
main.c	diff1 \|	diff2 \|	blob \| history
nbproject/Makefile-default.mk	diff1 \|	diff2 \|	blob \| history
nbproject/Makefile-genesis.properties	diff1 \|	diff2 \|	blob \| history
nbproject/configurations.xml	diff1 \|	diff2 \|	blob \| history
power.c	diff1 \|	diff2 \|	blob \| history