summaryrefslogtreecommitdiff
path: root/firmware/target/hosted
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2018-06-12 12:50:09 +0200
committerMarcin Bukat <marcin.bukat@gmail.com>2018-06-12 12:50:09 +0200
commit307ea8382e756bc6265e9edece074ff08c54267e (patch)
treeee39311ff5376c9b4800636e75efe3f5adfe7678 /firmware/target/hosted
parent71dc1a789ada01581e6a1be0f70c208e1eb2cddb (diff)
downloadrockbox-307ea8382e756bc6265e9edece074ff08c54267e.tar.gz
rockbox-307ea8382e756bc6265e9edece074ff08c54267e.zip
Fix merge errors which broke sony linux targets
Change-Id: Ic0c618c6e2034609d1964bb3e9ff96c7a7cf1d40
Diffstat (limited to 'firmware/target/hosted')
0 files changed, 0 insertions, 0 deletions