Skip to content
Commit 14f801a1 authored by Alex Deryskyba's avatar Alex Deryskyba
Browse files

Merge commit '1eb6601b' from upstream/openelec-4.2 

Conflicts:
	packages/linux/package.mk
parents 5a20a3d1 1eb6601b
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