review.tizen.org Git - contrib/mraa.git/commit

projects / contrib / mraa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9f2f5be d7c8f2a)

author	Thomas Ingleby <thomas.c.ingleby@intel.com>
	Fri, 11 Jul 2014 10:56:45 +0000 (11:56 +0100)
committer	Thomas Ingleby <thomas.c.ingleby@intel.com>
	Fri, 11 Jul 2014 10:56:45 +0000 (11:56 +0100)
commit	9bacfcff5fdebebca5f306ce7fbd4cc0a70f7e65
tree	52305cff23db9f7b035e45ca587a86a1a8598522	tree \| snapshot
parent	9f2f5be20ad6419467e653d933a124f3bb9234aa	commit \| diff
parent	d7c8f2a79431b8f9461597b86ef9f046357404c6	commit \| diff

Merge branch 'hook'

Conflicts:
include/intel_galileo_rev_d.h
include/intel_galileo_rev_g.h
include/mraa_adv_func.h
include/mraa_internal.h
src/gpio/gpio.c
src/mraa.c

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
include/mraa_internal.h	diff1 \|	diff2 \|	blob \| history
src/gpio/gpio.c	diff1 \|	diff2 \|	blob \| history
src/mraa.c	diff1 \|	diff2 \|	blob \| history

Domain: SCM / Uncategorized;