Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/openelec-5.0' into openelec-5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@codesnake
codesnake committed Nov 13, 2014
2 parents 012b1ea + f8a8d87 commit d7c27a4
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion config/version
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# VERSION: set full version, use "devel" for development version
OPENELEC_VERSION="devel"
OPENELEC_VERSION="4.95.2"

# OS_VERSION: OS Version
OS_VERSION="5.0"
Expand Down
2 changes: 1 addition & 1 deletion projects/Generic/linux/linux.i386.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
# CONFIG_NETFILTER_XT_MATCH_OSF is not set
# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
CONFIG_NETFILTER_XT_MATCH_OWNER=m
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
Expand Down
2 changes: 1 addition & 1 deletion projects/Generic/linux/linux.x86_64.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
# CONFIG_NETFILTER_XT_MATCH_OSF is not set
# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
CONFIG_NETFILTER_XT_MATCH_OWNER=m
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
Expand Down
2 changes: 1 addition & 1 deletion projects/RPi/linux/linux.arm.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
# CONFIG_NETFILTER_XT_MATCH_OSF is not set
# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
CONFIG_NETFILTER_XT_MATCH_OWNER=m
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
Expand Down
2 changes: 1 addition & 1 deletion projects/imx6/linux/linux.arm.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
# CONFIG_NETFILTER_XT_MATCH_OSF is not set
# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
CONFIG_NETFILTER_XT_MATCH_OWNER=m
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
Expand Down

0 comments on commit d7c27a4

Please sign in to comment.