Commit adad3378 authored by Guilherme Sanches's avatar Guilherme Sanches

Merge branch 'xky4.8-dev-canbus-configure' of...

Merge branch 'xky4.8-dev-canbus-configure' of http://spass-git.gmv.es/spass_admin/esroscos_xky into xky4.8-dev-canbus-configure

Hopefuly this was a successful merge operation
refs #104462

 Conflicts:
	air/pos/rtems5/rtems5/c/src/lib/libbsp/sparc/shared/amba/ambapp.c
parents 7d041dc4 6e25be99
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment