diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:33:25 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:59:03 +0200 |
| commit | 32a0454d3c495b12824ef4a0d0341237302d148a (patch) | |
| tree | 9acc870d089b0028cecdfb1846b828ae4bd38910 /package/connman | |
| parent | f9686563b4fd3eed22e26105f7c440f0b74fcac1 (diff) | |
| parent | dafa32b3bd75e9d155d075c796fa5b0ecbb9b11b (diff) | |
| download | buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.tar.gz buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.zip | |
Merge branch 'next'
Conflicts:
package/e2fsprogs/e2fsprogs.mk
package/libfuse/libfuse.mk
package/multimedia/mpd/mpd.mk
package/smartmontools/smartmontools.mk
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/connman')
| -rw-r--r-- | package/connman/connman.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 726cb7352..ed83ebc71 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ####################################################### -CONNMAN_VERSION = 1.4 +CONNMAN_VERSION = 1.6 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/ CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls CONNMAN_INSTALL_STAGING = YES |