Vladimír Čunát
55bbcd4e48
linuxPackages.nvidia_x11_beta: alias to stable
...
It doesn't seem much sense to have "beta" with version lower than "stable".
2018-02-08 19:55:28 +01:00
Andreas Rammhold
7a833cfcb8
nvidia_x11_beta: 381.22 -> 390.12
...
This change is done for completness in regards to [1] since we already
support a newer "stable" version.
nvidia_x11_beta now compiles on both 4.14 and 4.15.
[1] https://github.com/NixOS/nixpkgs/issues/31640
2018-02-08 12:55:45 +01:00
Michael Raskin
a600b621c8
linux_4_15: fix a partial version downgrade on staging merge
2018-02-08 12:43:08 +01:00
Frederik Rietdijk
50a9d51a09
Merge commit '30d031b5d8d05422586043c3f105f4d9110e4f59' into HEAD
2018-02-08 12:14:07 +01:00
adisbladis
e860b651d6
Merge pull request #34713 from dtzWill/update/zfs-spl-0.7.6
...
zfs, spl: 0.7.5 -> 0.7.6
2018-02-08 13:54:43 +08:00
Will Dietz
5da8924333
zfs, spl: 0.7.5 -> 0.7.6
...
Fixes compat with 4.15
(cc #34459 )
2018-02-07 18:49:26 -06:00
Tim Steinbach
c46a833e6c
linux-copperhead: 4.15.1.a -> 4.15.2.a
2018-02-07 19:47:20 -05:00
Tim Steinbach
9f3d57a31f
linux: 4.15.1 -> 4.15.2
2018-02-07 19:36:35 -05:00
Tim Steinbach
0b43d5a9cf
linux: 4.14.17 -> 4.14.18
2018-02-07 19:36:21 -05:00
sjau
0d65e2e0e5
zfs: add migration path for new crypto format
...
fixes #34559
2018-02-07 20:46:16 +00:00
Tuomas Tynkkynen
1b6e95e1eb
hdparm: 9.53 -> 9.54
2018-02-07 18:48:04 +02:00
Tuomas Tynkkynen
4c6c919a31
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
pkgs/os-specific/linux/kernel/generic.nix
2018-02-07 03:41:24 +02:00
Daiderd Jordan
db7e0aeb42
llvm-packages: cleanup
2018-02-06 23:38:46 +01:00
Tuomas Tynkkynen
685ceb999e
kernel: Fix missing config options from platform
...
common-config.nix has:
${kernelPlatform.kernelExtraConfig or ""}
and indeed kernelExtraConfig is in hostPlatform.platform, and not in
hostPlatform. (Ugh.).
2018-02-06 22:13:57 +02:00
John Ericson
63b8175281
Merge pull request #34351 from teto/kernel_wip
...
[RDY] buildLinux: Add more overrides
2018-02-06 12:08:12 -05:00
Matthieu Coudron
f620b1b693
kernel: buildLinux replaces import ./generic.nix
...
- defined buildLinux as generic.nix instead of manual-config.nix. This
makes kernel derivations a tad more similar to your typical derivations.
- moved $buildRoot to within the source folder, this way it doesn't have to be created before the unpackPhase
and make it easier to work on kernel source without running the unpackPhase
2018-02-07 10:07:13 +09:00
Tuomas Tynkkynen
9548028a22
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/os-specific/linux/cpupower/default.nix
2018-02-06 04:11:23 +02:00
Will Dietz
6ec60e8c44
busybox-sandbox-shell: extract basic shell to new attribute
...
Nix will use this shell if the attribute is present,
avoiding duplicating changes in the future.
2018-02-05 11:26:01 -06:00
Jason A. Donenfeld
ca78dc1704
wireguard: 0.0.20180118 -> 0.0.20180202
2018-02-05 13:09:12 +01:00
Robin Gloster
39172792c6
linuxPackages.cpupower: clean up
...
fixes the build on 17.09
2018-02-05 12:51:42 +01:00
John Ericson
de243f244f
Merge pull request #34312 from lopsided98/cpupower-pciutils-cross
...
cpupower, pciutils: enable cross compiling
2018-02-04 11:51:48 -05:00
Frederik Rietdijk
2dcb7573d9
Merge pull request #34579 from DarkScythe97/hwdata
...
hwdata: 0.300 -> 0.308
2018-02-04 12:33:56 +00:00
Tuomas Tynkkynen
b8dfab93cb
cifs-utils: 6.6 -> 6.7
2018-02-04 12:46:02 +02:00
Tuomas Tynkkynen
34b7ea6d45
Merge remote-tracking branch 'upstream/master' into staging
2018-02-04 12:22:39 +02:00
DarkScythe97
2fa14f3d5c
hwdata: 0.300 -> 0.308
2018-02-04 17:50:54 +10:30
Tim Steinbach
8c280d3ad5
linux: 4.15 -> 4.15.1
2018-02-03 20:38:25 -05:00
Tim Steinbach
4069faad7f
linux-copperhead: 4.15.a -> 4.15.1.a
2018-02-03 20:36:14 -05:00
Tim Steinbach
fcbb7da942
linux: 4.4.114 -> 4.4.115
2018-02-03 20:31:52 -05:00
Tim Steinbach
e5ffae3966
linux: 4.14.16 -> 4.14.17
2018-02-03 20:29:23 -05:00
Tim Steinbach
d6d4ef6580
linux: 4.9.79 -> 4.9.80
2018-02-03 20:27:04 -05:00
Tuomas Tynkkynen
d8571b5795
iproute: 4.14.1 -> 4.15.0
2018-02-04 02:47:21 +02:00
Tuomas Tynkkynen
f0d5bf8ce5
iptables: 1.6.1 -> 1.6.2
2018-02-04 02:47:19 +02:00
Michael Weiss
88c16a63c6
nvme-cli: 1.4 -> 1.5
2018-02-03 23:04:30 +01:00
Jörg Thalheim
27cdf62937
Merge pull request #34555 from womfoo/bump/fnotify-fork-power-smem-stat
...
bump {fnotify,fork,power,smem}stat to latest upstream
2018-02-03 12:17:54 +00:00
Kranium Gikos Mendoza
27045bc019
smemstat: 0.01.17 -> 0.01.18
2018-02-03 23:08:26 +11:00
Kranium Gikos Mendoza
33be552211
powerstat: 0.02.12 -> 0.02.15
2018-02-03 23:08:26 +11:00
Kranium Gikos Mendoza
7db36df4fe
fnotifystat: 0.01.17 -> 0.02.00
2018-02-03 23:08:26 +11:00
Kranium Gikos Mendoza
2b2254637b
forkstat: 0.02.00 -> 0.02.02
2018-02-03 23:08:26 +11:00
Tuomas Tynkkynen
10c8e6d0c5
Merge remote-tracking branch 'upstream/master' into staging
2018-02-03 02:50:21 +02:00
Austin Seipp
d8ba530e64
nvidia-x11: stable 387.34 -> 390.25
...
390.x is Nvidia's latest "Long Lived Branch version" according to
https://www.nvidia.com/object/unix.html so this upgrades the stable version
from 387.xx.
390.x also also has support for kernel 4.15 and later (due to removal of the
old init_timer APIs, among other things), meaning that
linuxPackages_4_15.nvidia_x11 now builds correctly.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-02-02 13:01:38 -06:00
Will Dietz
329db7b490
busybox: bump copybuf 4kB -> 64kB
2018-02-01 08:57:22 -06:00
Will Dietz
b78025586b
busybox: don't use utmp/wtmp on musl since they won't work anyway
...
https://wiki.musl-libc.org/faq.html#Q:-Why-is-the-utmp/wtmp-functionality-only-implemented-as-stubs ?
2018-02-01 08:51:21 -06:00
Vladimír Čunát
2fb4606f38
Merge branch 'master' into staging
...
Haskell rebuild.
Hydra: ?compare=1430378
2018-02-01 09:36:23 +01:00
Bjørn Forsman
f08e330ed4
lttng-modules: 2.10.0 -> 2.10.5
...
Fixes build failure against newer linux kernels.
2018-02-01 08:04:09 +01:00
Yegor Timoshenko
65187722ec
linuxPackages.broadcom-sta: fix build with Linux 4.15
...
See: https://lkml.org/lkml/2017/11/25/90
2018-01-31 23:04:10 +00:00
Jörg Thalheim
5877b811d4
Merge pull request #34407 from markuskowa/rdma-core-fix-pr
...
rdma-core: fix rxe_cfg and platforms flags
2018-01-31 22:45:17 +00:00
Bart Brouns
404475a783
tp_smapi: 0.42 -> unstable-2017-12-04
...
make it build for kernel 4.15
see https://github.com/evgeni/tp_smapi/issues/31 and #32
2018-01-31 20:56:16 +01:00
Tim Steinbach
6aa13b6b1d
linux: 4.9.78 -> 4.9.79
2018-01-31 09:06:30 -05:00
Tim Steinbach
26e06c9a92
linux: 4.4.113 -> 4.4.114
2018-01-31 09:06:17 -05:00
Tim Steinbach
27f5262cf2
linux: 4.14.15 -> 4.14.16
2018-01-31 09:05:54 -05:00
Jörg Thalheim
c208456d3a
rdma-core: set correct RUNDIR and SHAREDSTATEDIR
2018-01-30 23:01:25 +00:00
Vladimír Čunát
c9171e5a4c
Merge branch 'master' into staging
...
Hydra: ?compare=1430035
2018-01-30 19:51:33 +01:00
Markus Kowalewski
7c554c13ee
rdma-core: fix platform flag
2018-01-29 22:05:58 -08:00
Markus Kowalewski
dcdaea355a
rdma-core: fix paths in rxe_cfg
2018-01-29 22:05:45 -08:00
Markus Kowalewski
043dece5b7
beegfs: build beeond
2018-01-29 21:47:50 -08:00
Markus Kowalewski
e4570af493
beegfs: add rdma support
2018-01-29 19:57:49 -08:00
Herwig Hochleitner
499b3edb30
criu: 2.12.1 -> 3.7
...
cc @thoughtpolice
2018-01-30 00:03:11 +01:00
Franz Pletz
393e39e2e5
Revert "microcodeIntel: 20171117 -> 20170108"
...
This reverts commit 9b7ef9c738
.
Intel recommends to stop deployment of the updated microcode as it
introduces unexpected system behaviour on many platforms.
See https://security-center.intel.com/advisory.aspx?intelid=INTEL-SA-00088&languageid=en-fr
cc #33414
2018-01-29 20:30:44 +01:00
Franz Pletz
f2dc4781f1
upower: 0.99.4 -> 0.99.7
2018-01-29 19:17:10 +01:00
Tim Steinbach
61043ad4d1
linux: Add 4.15
2018-01-29 11:52:50 -05:00
Tim Steinbach
da26e92078
linux-copperhead: 4.14.15.a -> 4.15.a
2018-01-29 11:52:50 -05:00
Ben Wolsieffer
84f54b898a
cpupower: enable cross compilation
2018-01-28 18:47:22 -05:00
Franz Pletz
4bb42d0561
Merge pull request #34235 from dtzWill/feature/ipvsadm
...
ipvsadm: init at 1.29
2018-01-28 22:41:35 +00:00
Will Dietz
192f30f06a
nettools: 1.60_p20161110235919 -> 1.60_p20170221182432
...
Nothing critical, here's the highlights:
* ROSE fixes
* arp scanf/output fix
* linux header compat:
ea3935bd7c
/
Commit log (short):
479bb4a7e1/log/
2018-01-28 21:22:37 +00:00
Franz Pletz
c92c2fe7c0
lxc: 2.1.0 -> 2.1.1
2018-01-28 18:52:30 +01:00
Franz Pletz
943e32abb7
conky: 1.10.6 -> 1.10.7
2018-01-28 18:52:23 +01:00
Tuomas Tynkkynen
2f39b19535
mdadm: Make 4.0 the default
...
4.0 has been out for a year without another upstream release, so
presumably 4.x's quite stable enough (and already in Arch & Debian
Buster for instance).
2018-01-28 13:31:50 +02:00
Vladimír Čunát
2d2dbe083f
Merge branch 'master' into staging
...
Hydra: ?compare=1429281
2018-01-27 09:14:22 +01:00
Sarah Brofeldt
7f1c5a124c
Merge pull request #34093 from markuskowa/rdma-core-pr
...
rdma-core: init at 16.1
2018-01-27 02:17:10 +01:00
Tim Steinbach
3391266ee7
linux-copperhead: 4.14.14.a -> 4.14.15.a
2018-01-25 09:12:03 -05:00
Will Dietz
f9238bf19f
ipvsadm: init at 1.29
...
Fixes #34226 .
2018-01-24 10:43:32 -06:00
Frederik Rietdijk
769342b37b
Merge remote-tracking branch 'upstream/master' into HEAD
2018-01-24 14:17:49 +01:00
Tuomas Tynkkynen
d9aebebaf5
Revert "perf: apply patch to fix build of 4.9"
...
This reverts commit 44dc31bad1
.
The patch has been applied in 4.9.78, so no need to have this in
nixpkgs anymore.
2018-01-23 23:17:24 +02:00
Tuomas Tynkkynen
acf5b8e662
kernel: 4.9.77 -> 4.9.78
2018-01-23 23:17:24 +02:00
Tuomas Tynkkynen
4276c0d898
kernel: 4.4.112 -> 4.4.113
2018-01-23 23:17:24 +02:00
Tuomas Tynkkynen
1481937af2
kernel: 4.14.14 -> 4.14.15
2018-01-23 23:17:24 +02:00
Ben Gamari
2a5bf4cb40
alsa-utils: Enable cross-compilation
2018-01-22 20:25:45 -05:00
Ben Gamari
c3bf521f18
procps: Enable cross-compilation
2018-01-22 20:25:44 -05:00
John Ericson
1f70b32725
Merge pull request #34174 from dtzWill/update/wirelesstools
...
wirelesstools: update, add license, fix w/cross
2018-01-22 19:51:36 -05:00
Will Dietz
0b0e2d68b8
audit: depsBuildBuild for build-native cc
2018-01-22 17:24:53 -06:00
Will Dietz
de54275cfb
wireless-tools: don't assume gcc, don't use ldconfig, fix cross
2018-01-22 17:21:34 -06:00
Will Dietz
e5f677fed1
wirelesstools: update (alpine uses this version), fix build, add license
2018-01-22 17:21:34 -06:00
WilliButz
3e173f39be
irqbalance: 1.2.0 -> 1.3.0
2018-01-22 19:14:20 +01:00
Tuomas Tynkkynen
a2b8264377
linux_testing: 4.15-rc8 -> 4.15-rc9
2018-01-22 10:44:50 +02:00
Vladimír Čunát
246ba46db7
Merge older staging (finished on Hydra)
...
https://hydra.nixos.org/eval/1427837?filter=&compare=1427817
Fixes #34087 .
2018-01-22 08:54:37 +01:00
Jörg Thalheim
e36a3623e9
wireguard: 0.0.20171221 -> 0.0.20180118
2018-01-21 22:17:26 +00:00
Ben Wolsieffer
94276da9e9
perf: inherit makeFlags from kernel
2018-01-21 13:54:39 +02:00
Ben Wolsieffer
44dc31bad1
perf: apply patch to fix build of 4.9
2018-01-21 13:54:39 +02:00
Markus Kowalewski
c6b828b86e
rdma-core: init at 16.1
2018-01-20 15:09:14 -08:00
Tuomas Tynkkynen
45e47c14be
devicemapper: 2.02.176 -> 2.02.177
2018-01-20 23:19:35 +02:00
Jörg Thalheim
959e9336ee
sysdig: 0.19.1 -> 0.20.0
2018-01-20 10:50:17 +00:00
Vladimír Čunát
94f4857bc5
Merge branch 'master' into staging
...
Hydra: ?compare=1427817
2018-01-20 10:05:27 +01:00
corpix
0db68e5d42
apparmor: updating utilities to fresh python ( #34049 )
...
* apparmor: updating utilities to fresh python
* apparmor: better way to depend on python
* apparmor: override python derivation on the top-level
2018-01-20 09:29:03 +01:00
Orivej Desh
c053bab151
Merge pull request #34017 from dtzWill/fix/perf-compilation
...
Fix build of linuxPackages.perf
2018-01-19 19:57:47 +00:00
Orivej Desh
b694071838
Merge pull request #34016 from dtzWill/update/perf-tools-20171219
...
perf-tools: 20160418 -> 20171219
2018-01-19 19:55:20 +00:00
Andreas Rammhold
a4edba9943
Merge pull request #34045 from andir/kmod-missing-libelf
...
Fix remaining 4.14 libelf outbreak
2018-01-19 14:16:22 +00:00
Andreas Rammhold
2bd9f81abd
linuxPackages.v4l2loopback: fix compilation with linux-4.14
2018-01-19 14:40:13 +01:00
Andreas Rammhold
5640b08a88
linuxPackages.phc-intel: fix build with linux-4.14
2018-01-19 14:40:13 +01:00
Tuomas Tynkkynen
1dade8665a
hdparm: 9.52 -> 9.53
2018-01-19 00:00:36 +02:00
John Ericson
a18053bdfe
Merge remote-tracking branch 'upstream/master' into staging
2018-01-18 14:17:58 -05:00
Will Dietz
4ca9b43f12
perf: fix cross evaluation
2018-01-18 10:47:40 -06:00
Will Dietz
fc4535b6e8
Revert "perf: inherit makeFlags from kernel"
...
https://github.com/NixOS/nixpkgs/issues/34013
This reverts commit 92083c3f40
.
2018-01-18 10:47:26 -06:00
Will Dietz
9798c74313
perf-tools: 20160418 -> 20171219
2018-01-18 10:24:06 -06:00
Drew Hess
83a85b60ad
linux_beagleboard: 4.9.61-ti-r76 -> 4.14.12-ti-r23
2018-01-18 17:04:47 +02:00
Frederik Rietdijk
27f6f9409b
Merge pull request #33967 from yegortimoshenko/20180117.050213/mornfall
...
maintainers: remove mornfall from packages
2018-01-18 11:27:31 +01:00
Tuomas Tynkkynen
61a75a1d22
Merge remote-tracking branch 'upstream/master' into staging
2018-01-18 00:24:33 +02:00
Tim Steinbach
696be7a0b0
linux-copperhead: 4.14.13.a -> 4.14.14.a
2018-01-17 13:30:16 -05:00
adisbladis
c2f57b0099
firejail: 0.9.50 -> 0.9.52
2018-01-18 02:24:24 +08:00
Tim Steinbach
791d5b3cc0
linux: 4.4.111 -> 4.4.112
2018-01-17 08:57:19 -05:00
Tim Steinbach
c460e268bf
linux: 4.9.76 -> 4.9.77
2018-01-17 08:57:19 -05:00
Tim Steinbach
94d03b3b21
linux: 4.14.13 -> 4.14.14
2018-01-17 08:57:19 -05:00
Tuomas Tynkkynen
b1c1190f36
utillinux: 2.31 -> 2.31.1
2018-01-17 12:53:22 +02:00
Tuomas Tynkkynen
10bcf978eb
kmod: 24 -> 25
2018-01-17 12:53:22 +02:00
Tuomas Tynkkynen
b5fc6b7c10
audit: 2.8.1 -> 2.8.2
2018-01-17 12:53:22 +02:00
Tuomas Tynkkynen
67c73b4e64
Merge commit '2e56ba' from staging into master
2018-01-17 12:50:46 +02:00
Yegor Timoshenko
506c89c30a
maintainers: remove mornfall from packages
2018-01-17 05:17:33 +00:00
Andreas Rammhold
4774356724
batman-adv: 2017.3 -> 2017.4
2018-01-17 02:55:13 +01:00
Andreas Rammhold
1eb62129d9
batman-adv: add missing nativeBuildInputs
2018-01-17 02:46:29 +01:00
Tobias Geerinckx-Rice
0f84673f3d
Remove nckx as a maintainer for all packages
...
Goodbye, and thanks for all the Nix...
2018-01-16 23:00:49 +01:00
Tuomas Tynkkynen
2e56ba6fbd
Merge remote-tracking branch 'upstream/master' into staging
2018-01-16 22:49:20 +02:00
John Ericson
782b63d06b
Merge pull request #33813 from lopsided98/kernel-cross
...
kernel: fix cross compilation
2018-01-16 13:09:09 -05:00
John Ericson
5a754e75b4
Merge branch 'ericson2314-cross-master' into staging
2018-01-16 13:05:39 -05:00
schuppentier
6f7c197700
evdi: 1.4.1+git2017-06-12 -> unstable-2018-01-12 ( #33907 )
2018-01-16 09:05:42 +00:00
Ben Wolsieffer
7bb3a044be
kernel: fix dependencies
2018-01-15 22:28:45 -05:00
Ben Wolsieffer
80f6b8e2ba
kernel: revert seemingly incorrect change to extraMeta merging
2018-01-15 12:55:24 -05:00
Ben Wolsieffer
92083c3f40
perf: inherit makeFlags from kernel
2018-01-15 12:48:56 -05:00
Ben Wolsieffer
285181a1db
kernel: remove leftover remnants of old cross compiling system
2018-01-15 12:48:51 -05:00
Ben Wolsieffer
a09709bf2a
kernel: don't force ignoreConfigErrors when cross compiling, only set the
...
default
2018-01-15 12:39:45 -05:00
Ben Gamari
b4b04dd29f
kernel: Fix cross-compilation
2018-01-15 11:55:23 -05:00
Ben Gamari
50e2bb12f6
kernel: Use build kmod
2018-01-15 11:55:23 -05:00
Ben Gamari
7a9b6ac39a
kernel: Enable cross compiling
2018-01-15 11:55:06 -05:00
Tuomas Tynkkynen
6e84522610
linux_testing: 4.15-rc7 -> 4.15-rc8
2018-01-15 12:14:39 +02:00
Vladimír Čunát
67e8392383
Merge #33057 : stdenv meta checks: make them lazy
...
Closes #22277 - it's superseded; I have some WIP on evaluation
performance, but best do that in a separate PR/thread.
2018-01-14 21:41:31 +01:00
Jan Malakhovski
85cd22cf7d
treewide: replace addPassthru
2018-01-14 19:53:57 +00:00
Tuomas Tynkkynen
6ed0fe7e45
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/build-support/fetchbower/default.nix
pkgs/build-support/fetchdarcs/default.nix
pkgs/build-support/fetchgx/default.nix
pkgs/development/python-modules/botocore/default.nix
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
pkgs/tools/admin/awscli/default.nix
2018-01-14 21:18:27 +02:00
Jan Malakhovski
8606dd8556
lib: change the order of arguments of addPassthru
2018-01-14 13:24:30 +00:00
Jörg Thalheim
5ccfd0ee34
linuxPackages.extfat-nofuse: fix libelf dependency
2018-01-13 18:45:04 +00:00
Jörg Thalheim
1db3b1c2d7
Merge pull request #33818 from rnhmjoj/rewritefs
...
rewritefs: remove needless quotation
2018-01-13 10:43:03 +00:00
rnhmjoj
b863f23df1
rewritefs: remove needless quotation
2018-01-13 04:09:07 +01:00
rnhmjoj
e76eb4ea88
btfs: 2.17 -> 2.18
2018-01-13 03:52:23 +01:00
adisbladis
65774cb22e
busybox: 1.27.2 -> 1.28.0
2018-01-11 21:42:32 +08:00
Tim Steinbach
eb0ecd7eba
linux-copperhead: 4.14.12.a -> 4.14.13.a
2018-01-11 08:30:19 -05:00
John Ericson
e017a027d5
Merge pull request #33681 from obsidiansystems/fixed-output-deps
...
Fixed output deps
2018-01-10 14:28:10 -05:00
John Ericson
888404f11b
treewide: Fix deps in a few other fixed output derivations
2018-01-10 11:18:44 -05:00
Andreas Rammhold
74c9d1696f
linux_4_9: 4.9.75 -> 4.9.76
2018-01-10 13:50:49 +01:00
Andreas Rammhold
e94dab0ca3
linux_4_4: 4.4.110 -> 4.4.111
2018-01-10 13:50:49 +01:00
Andreas Rammhold
cf8021e73a
linux_4_14: 4.14.12 -> 4.14.13
...
In terms of spectre/meltdown this version also supports loading of amd
fam17h firmware.
2018-01-10 13:50:45 +01:00
adisbladis
c72a05b88d
zfsUnstable: 2017-12-28 - 2018-01-10
2018-01-10 20:22:46 +08:00
Andreas Rammhold
9b7ef9c738
microcodeIntel: 20171117 -> 20170108
2018-01-10 03:07:59 +01:00
John Ericson
c3052295fa
Merge commit '3ed545ab31146e607c57649936c75869d6aa9ba2' into ericson2314-cross-master
2018-01-09 17:19:27 -05:00