]> rtime.felk.cvut.cz Git - pes-rpp/rpp-test-sw.git/commit
Merge branches 'master' and 'rm48/master'
authorMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 8 Jul 2015 15:48:14 +0000 (17:48 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 8 Jul 2015 16:17:14 +0000 (18:17 +0200)
commitb3cc40c637c2df366e95a8a8d78cb3127825b142
tree31515adf147aa1dc9c0464ef68b171c2ce50f563
parentdb13ceeb88e638f550b472d594dc518cb52a976e
parent73e956f5f8459466ec7d6a5d5c8a459668d5e383
Merge branches 'master' and 'rm48/master'

Conflicts:
Makefile
rpp-lib
rpp-test-sw/.ccsproject
rpp-test-sw/.cproject
rpp-test-sw/commands/_tms570_rpp/cmd.c
rpp-test-sw/commands/_tms570_rpp/main.c
rpp-test-sw/commands/cmd_fr_basic_test.c
rpp-lib
rpp-test-sw/Makefile.inc
rpp-test-sw/commands/_tms570_rpp/cmd_pin.c
rpp-test-sw/commands/_tms570_rpp/cmd_port.c
rpp-test-sw/commands/cmd.c
rpp-test-sw/commands/cmd_fray.c
rpp-test-sw/commands/cmd_spi.c
rpp-test-sw/commands/main.c