Skip to content
Commit 8060e34b authored by Alex Deryskyba's avatar Alex Deryskyba
Browse files

Merge remote-tracking branch 'upstream/openelec-4.2' into openelec-4.2 

Conflicts:
	packages/linux/package.mk
parents b067a32c 153d06b6
Hide whitespace changes
Inline Side-by-side
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