JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
216,421 Commits 2 Branches 0 Tags 13 GiB
edaceeae80
Commit Graph

3274 Commits

Author SHA1 Message Date
Oleksii Filonenko
f930613999
runelite: 1.6.0 -> 2.0.0 
Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
 2020-01-06 09:13:42 -05:00
R. RyanTM
fb7c60a83c gcompris: 0.97 -> 0.98 2020-01-06 04:35:56 -08:00
Ryan Mulligan
a5c346f6a7
Merge pull request #60518 from bignaux/gweled 
gweled: init at unstable-2018-02-15
 2020-01-05 21:18:09 -08:00
Frederik Rietdijk
7aa2b0215b Merge master into staging-next 2020-01-03 10:25:14 +01:00
Franz Pletz
804678f9ea
Merge pull request #76756 from mehlon/hyperrogue 
hyperrogue: 10.5e -> 11.2d
 2020-01-03 03:10:37 +00:00
Danylo Hlynskyi
c9bf6aebaa
Merge pull request #76770 from dtzWill/update/devilutionx-1.0.0 
devilutionx: 0.5.0 -> 1.0.0, install font file
 2020-01-03 00:02:42 +02:00
Frederik Rietdijk
f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Franz Pletz
8b60bfd5d9
Merge pull request #76818 from lheckemann/ee-bump 
EmptyEpsilon: 2019.05.21 -> 2019.11.01
 2020-01-02 13:29:20 +00:00
Linus Heckemann
a664899b39 EmptyEpsilon: 2019.05.21 -> 2019.11.01 2020-01-02 13:30:35 +01:00
Will Dietz
2f040f691b
devilutionx: 0.5.0 -> 1.0.0 
https://github.com/diasurgical/devilutionX/releases/tag/1.0.0
 2020-01-01 01:44:14 -06:00
Will Dietz
a133f8e643
devilutionx: install required font file 2020-01-01 01:44:03 -06:00
mehlon
c510bbf011 hyperrogue: 10.5e -> 11.2d 2020-01-01 00:59:03 +01:00
Jan Tojnar
0c2adc0fb1
Merge branch 'staging' into staging-next 2019-12-31 03:59:58 +01:00
Robin Gloster
6ca6ac796b
treewide: configureFlags is a flat list 2019-12-31 01:37:49 +01:00
Robin Gloster
313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster
f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Robin Gloster
5f2b92e3ec
treewide: NIX_*_COMPILE -> string 2019-12-31 00:13:29 +01:00
Robin Gloster
ab0cfd9e03
treewide: NIX_*_COMPILE -> string 2019-12-31 00:10:18 +01:00
Jonathan Ringer
446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next 2019-12-30 10:14:18 -08:00
Jonathan Ringer
21958c0603 steam.chroot: add at-spi2-core 
Needed by CrossCode
 2019-12-30 17:13:12 +01:00
Frederik Rietdijk
6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Robin Gloster
65395a7105
treewide: installTargets is a list 2019-12-30 13:29:27 +01:00
Robin Gloster
2157dcd141
treewide: installFlags is a list 2019-12-30 13:22:43 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Robin Gloster
9052e1c5b7
pingus: *Flags are lists 2019-12-30 12:15:28 +01:00
Robin Gloster
ac8eaa8507
treewide: fix *Flags 2019-12-30 04:50:37 +01:00
Jan Tojnar
814dcd907f
xbomb: clean up 
Use makeFlags instead of patching Makefile
 2019-12-29 22:13:56 +01:00
Franz Pletz
43442880cf
cataclysm-dda: fix build on darwin 2019-12-27 05:21:41 +01:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
Aaron Andersen
088224843a
Merge pull request #76439 from r-ryantm/auto-update/tome4 
tome4: 1.6.1 -> 1.6.5
 2019-12-24 18:43:24 -05:00
Aaron Andersen
3fe099d2c5
Merge pull request #76449 from r-ryantm/auto-update/supertux 
superTux: 0.6.0 -> 0.6.1.1
 2019-12-24 17:51:15 -05:00
R. RyanTM
6f6c1d2f03 superTux: 0.6.0 -> 0.6.1.1 2019-12-24 12:44:48 -08:00
R. RyanTM
4196f26efa tome4: 1.6.1 -> 1.6.5 2019-12-24 11:38:20 -08:00
Mario Rodas
e6c6ba9fd4
Merge pull request #75280 from r-ryantm/auto-update/mnemosyne 
mnemosyne: 2.6.1 -> 2.7
 2019-12-22 18:10:13 -05:00
drakonis
2b725bbb69 gzdoom: include missing soundfont files 2019-12-22 12:51:43 +01:00
worldofpeace
e7c568a0b0
Merge pull request #45347 from bignaux/pysolfc 
PySolFC: 2.0 -> 2.6.4
 2019-12-21 22:20:48 -05:00
Renaud
60820d8d83
Merge pull request #75648 from jorsn/tintin.add-ssl 
tintin: added ssl support via gnutls
 2019-12-20 23:31:28 +01:00
Mario Rodas
6b935eb62a lgogdownloader: fix build 2019-12-19 16:56:01 +01:00
Bignaux Ronan
615742297f PySolFC: 2.0 -> 2.6.4 2019-12-16 01:43:08 +01:00
Philipp Middendorf
2b298a3ef1 quake3e: 2019-09-09 -> 2019-11-29 (#75511) 2019-12-15 02:16:53 -05:00
worldofpeace
be13df6c76
Merge pull request #75465 from worldofpeace/gnome-args 
doc/gnome: update wrapper args example, remove proliferated uses
 2019-12-15 00:13:17 -05:00
worldofpeace
abe3475df8 treewide: remove bash snippets in flags 
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
 2019-12-15 00:10:41 -05:00
Johannes Rosenberger
9de076f45c tintin: added ssl support via gnutls 
Now passwords can be sent encrypted via tls.

Closure size difference is +18.36 MB (+161.38%). Therefore there is a
switch `tlsSupport ? true` to turn off tls.
 2019-12-14 12:44:07 +01:00
Free Potion
34cc9d7fa2
harmonist: 0.2 -> 0.3.0 2019-12-14 01:43:20 +03:00
Mario Rodas
98e57f8999
Merge pull request #74064 from shazow/cdda-git-bump 
cataclysm-dda-git: 2019-05-03 -> 2019-11-22
 2019-12-11 18:38:50 -05:00
Markus S. Wamser
1deb709fcf hexen: remove abandoned software 2019-12-11 01:03:44 +01:00
Orivej Desh
571c310007 qtads: init at 2.1.99.2019-04-12 
This version is much easier to package than the last 2016 release.
It self-describes as 2.1.99 in Help > About.
https://github.com/realnc/qtads/issues/8
 2019-12-09 00:55:40 +00:00
Orivej Desh
5bd1bd08ed instead: 3.3.0 -> 3.3.1 2019-12-09 00:17:28 +00:00
Michael Raskin
c142423a8d sgtpuzzles: 2019045 -> 20191114 2019-12-08 23:47:43 +01:00
R. RyanTM
c29da36845 mnemosyne: 2.6.1 -> 2.7 2019-12-08 10:34:43 -08:00
c0bw3b
69b393ace5 Treewide: update some problematic homepages 
These URLs are reported as problematic by Repology.
It could be a permanent redirection
or the page does not exist anymore
 2019-12-08 10:21:29 -08:00
Dima
fdefc23f7d mnemosyne: fix application 
This application has been missing some dependencies and the
correct environment for Qt. Additionally I added a depdency
on anki to support the import feature.

The project has also moved development to Github, as very briefly
mentioned on https://mnemosyne-proj.org/contributing.php but the
2.6.1 version released there seems to differ and causes a bunch
of new problems, so leaving it for now.
 2019-12-07 22:26:54 +01:00
Philipp
fc473f38d0 mudlet: 4.1.2 -> 4.3 2019-12-07 22:14:14 +01:00
Tristan Gosselin-Hane
289088ef72 minecraft: 2.1.7658 -> 2.1.9618 2019-12-05 16:03:02 -05:00
Mateusz Kowalczyk
1451a52a38 Remove myself (fuuzetsu) from maintainer lists 
I haven't been doing any maintenance for a long time now and not only
do I get notified, it also creates a fake impression that all these
packages had at least one maintainer when in practice they had none.
 2019-12-05 16:29:48 +09:00
Lengyel Balazs
6fad697f96 factorio: update all versions to 0.17.79 
and adds libpulseaudio as a dependency
 2019-12-03 18:07:33 +01:00
Andrey Petrov
5e8770a8bb cataclysm-dda-git: 2019-05-03 -> 2019-11-22 2019-12-01 08:46:52 -08:00
R. RyanTM
e95664bab6 pioneer: 20191009 -> 20191117 2019-12-01 15:13:48 +01:00
lassulus
3b167789a6 zandronum: 3.0 -> 3.0.1 2019-11-30 21:48:03 -08:00
Jan Tojnar
a69ad18da9
Merge branch 'master' into staging-next 2019-11-30 19:44:51 +01:00
R. RyanTM
cb521df936 tintin: 2.01.91 -> 2.01.92 (#74684) 2019-11-30 14:43:31 +01:00
markuskowa
8833e8cfaf
Merge pull request #74678 from r-ryantm/auto-update/vkquake 
vkquake: 1.02.1 -> 1.03.0
 2019-11-30 12:41:22 +01:00
Frederik Rietdijk
d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
R. RyanTM
731992a8b0 vkquake: 1.02.1 -> 1.03.0 2019-11-29 12:42:00 -08:00
R. RyanTM
66caa08067 tome4: 1.6.0 -> 1.6.1 2019-11-29 12:05:32 -08:00
Fabian Möller
b21700a6b6 alienarena: fix libGL path 2019-11-26 18:01:02 +01:00
Frederik Rietdijk
06a054e6eb Merge master into staging-next 2019-11-25 21:51:57 +01:00
gnidorah
c67d3f1a87 openxray: make it work again after #72199 2019-11-24 16:10:28 +01:00
worldofpeace
0f00c2aee2 chessx: use qt5's mkDerivation and latest qt 
Fixes #74020

https://github.com/NixOS/nixpkgs/issues/65399
 2019-11-24 06:29:47 -05:00
Frederik Rietdijk
1d18c5a0fe Merge staging-next into staging 2019-11-24 10:13:31 +01:00
edef
0e76e6bee8 steam: refer to unaliased gtk3 and gdk-pixbuf 2019-11-23 03:53:39 +00:00
Michael Raskin
1ca8255fb2 construo: fix build 2019-11-22 17:41:47 +01:00
Michael Raskin
329ca619f8 extremetuxracer: fix build 2019-11-22 17:41:46 +01:00
lassulus
5923cf4248 gzdoom: 4.2.3 -> 4.2.4 2019-11-20 16:53:25 -08:00
Free Potion
f18e73c815 boohu: 0.12.0 -> 0.13.0 2019-11-20 15:40:45 -08:00
Frederik Rietdijk
10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Frederik Rietdijk
5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
William G Hatch
4fbb59ab99 endless-sky: 0.9.8 -> 0.9.10 2019-11-18 14:58:30 -07:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Jonathan Ringer
87c674daef steam: use 32bit version of libva 2019-11-16 12:02:54 +01:00
c0bw3b
9367367dfd Treewide: fix URL permanent redirects 
Permanent redirects on homepages and/or source URLs
as reported by Repology
 2019-11-16 01:41:23 +01:00
Renaud
e8de40db65
Merge pull request #72212 from lightbulbjim/openrct2-update 
openrct2: 0.2.3 -> 0.2.4
 2019-11-14 18:55:24 +01:00
Aaron Andersen
9dbbfb78c5
Merge pull request #73108 from baldo/steam 
steam: Add libva to chrootenv
 2019-11-11 16:23:47 -05:00
Aaron Andersen
706fbecc3d
Merge pull request #72682 from r-ryantm/auto-update/tome4 
tome4: 1.5.10 -> 1.6.0
 2019-11-10 13:48:34 -05:00
Renaud
04d63387a4
Merge pull request #72155 from lightbulbjim/crawl-update 
crawl: 0.23.2 -> 0.24.0
 2019-11-10 14:15:29 +01:00
Aaron Andersen
4bdf29c94b
Merge pull request #72968 from fgaz/shattered-pixel-dungeon/0.7.5f 
shattered-pixel-dungeon: 0.7.5e -> 0.7.5f
 2019-11-10 08:02:34 -05:00
Andreas Baldeau
5a13b856c4 steam: Add libva to chrootenv 
After the newest update Steam itself complained about missing files
and would not start:

* libva.so.2
* libva-x11.so.2
 2019-11-09 12:02:51 +01:00
Matthew Bauer
11cc9d9851
Merge pull request #69176 from 0x4A6F/master-eidolon 
eidolon: init at 1.4.6
 2019-11-07 17:38:58 -05:00
Francesco Gazzetta
3b45b5bf7e shattered-pixel-dungeon: 0.7.5e -> 0.7.5f 2019-11-07 10:50:20 +01:00
Franz Pletz
8dca8b9ccb
Merge remote-tracking branch 'origin/master' into gcc-9 2019-11-05 01:07:22 +01:00
gnidorah
0f68bf333c openxray: 510 -> 558 2019-11-04 08:54:02 -08:00
gnidorah
b505f81181 openjk: 2019-06-24 -> 2019-10-25 2019-11-04 08:54:02 -08:00
gnidorah
1c3407f954 openmw-tes3mp: 2019-06-09 -> 2019-07-01 2019-11-04 08:54:02 -08:00
gnidorah
afb4d447ba vkquake: 1.01.0 -> 1.02.1 2019-11-04 08:54:02 -08:00
Michael Raskin
d690c20efd
Merge pull request #71814 from puckipedia/frozen-bubble 
frozen-bubble: init at 2.212
 2019-11-04 06:00:43 +00:00
worldofpeace
7c4f09f695
Merge pull request #72319 from gnidorah/mame 
mame: init at 0.215
 2019-11-03 19:18:53 +00:00
gnidorah
cf17479caa sdlmame: drop 
There are no longer separate programs called SDLMAME or SDLMESS. Instead, the SDL capability is included in MAME and MESS, and the makefile will auto-detect if you are on a non-Windows system and run accordingly.
 2019-11-03 20:02:16 +03:00
Franz Pletz
65eb7fe785
cataclysm-dda: fix build with gcc9 2019-11-03 14:43:34 +01:00
R. RyanTM
7d884032b2 tome4: 1.5.10 -> 1.6.0 2019-11-03 01:44:41 -07:00
Kevin Cox
6b61d85a9d
Merge branch 'master' into kevincox-oa_ded 2019-10-31 22:22:34 +00:00
Chris Rendle-Short
5dd2410bdc openrct2: 0.2.3 -> 0.2.4 2019-10-31 07:15:04 +11:00
Dmitry Kalinkin
3328244936
Merge pull request #72037 from kragniz/openrw-2019-10-26 
openrw: 2017-09-17 -> 2019-10-26
 2019-10-29 16:15:24 -04:00
Dmitry Kalinkin
ddbf53b855
openrw: move cmake to nativeBuildInputs, fix on darwin 
Darwin fix as suggested by @risicle
 2019-10-29 14:08:29 -04:00
Chris Rendle-Short
c972e1b0d5 crawl: 0.23.2 -> 0.24.0 2019-10-28 21:20:42 +11:00
Jonathan Ringer
eaa53f737e
minecraft: 2.1.5965 -> 2.1.7658 2019-10-26 13:55:05 -07:00
Louis Taylor
3affc7fb8f
openrw: 2017-09-17 -> 2019-10-26 2019-10-26 18:40:53 +01:00
Marek Mahut
14be1bdffe
Merge pull request #71764 from r-ryantm/auto-update/pioneer 
pioneer: 20190203 -> 20191009
 2019-10-26 14:03:43 +02:00
Ricardo Ardissone
4de18778a3 hedgewars: 1.0.0-beta2 -> 1.0.0 2019-10-26 13:52:18 +02:00
Aaron Andersen
2921e8a82a
Merge pull request #71789 from tomfitzhenry/openarena-server 
openarena: add module and test
 2019-10-26 07:48:19 -04:00
Francesco Gazzetta
882a960312 shattered-pixel-dungeon: 0.7.4c -> 0.7.5e 2019-10-26 11:10:18 +02:00
Francesco Gazzetta
7ff539d1d1 shattered-pixel-dungeon: init at 0.7.4c 2019-10-25 20:29:24 +02:00
Tom Fitzhenry
230fc22e61 openarena: add module for dedicated server 2019-10-26 00:57:54 +11:00
Kevin Cox
995fbac56f
openarena: oa_ded link. 2019-10-25 14:44:27 +01:00
lassulus
12b5da288c gzdoom: 4.2.1 -> 4.2.3 2019-10-25 13:50:41 +02:00
Aaron Andersen
6bdf8c09a9
Merge pull request #71879 from rardiol/widelands 
widelands: 19 -> 20
 2019-10-25 03:58:36 -04:00
Aaron Andersen
a6d5d5c871
Merge pull request #71686 from jonringer/fix-redeclipse 
redeclipse: fix src url
 2019-10-25 03:33:42 -04:00
R. RyanTM
ed57cd6147 tintin: 2.01.90 -> 2.01.91 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tintin/versions
 2019-10-24 20:14:09 -07:00
Ricardo Ardissone
94487d0e0a widelands: 19 -> 20 2019-10-23 20:48:28 -03:00
Puck Meerburg
9f52dabf79 frozen-bubble: init at 2.212 2019-10-23 18:50:06 +00:00
R. RyanTM
f45601d7d6 pioneer: 20190203 -> 20191009 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/pioneer/versions
 2019-10-22 22:44:00 -07:00
Jonathan Ringer
ec39360a7c
redeclipse: fix src url 2019-10-22 08:31:19 -07:00
Frederik Rietdijk
d7a921cad9
Merge pull request #71221 from NixOS/staging-next 
Staging next
 2019-10-22 09:15:19 +02:00
Carles Pagès
4ee309a68d
Merge pull request #71469 from sengaya/openxcom-1.0.0.2019.10.18 
openxcom: 1.0.0.2018.10.08 -> 1.0.0.2019.10.18
 2019-10-21 22:46:27 +02:00
Franz Pletz
cf52cd402c
Merge pull request #71254 from MicrosoftTakeover/patch-1 
minetest 5.0.1 -> 5.1.0
 2019-10-21 10:32:26 +00:00
Frederik Rietdijk
b6ba25ce95 Merge master into staging-next 2019-10-21 09:55:24 +02:00
Karol Chmist
47f47b46bc devilutionx: unstable-2019-07-28 -> 0.5.0 (#70971) 
devilutionx: unstable-2019-07-28 -> 0.5.0
 2019-10-20 20:10:52 -04:00
Thilo Uttendorfer
b09794c3b2 openxcom: 1.0.0.2018.10.08 -> 1.0.0.2019.10.18 
- Updated repo owner
 2019-10-20 22:40:18 +02:00
Frederik Rietdijk
ad8bd84fc9 Merge master into staging-next 2019-10-20 16:22:45 +02:00
worldofpeace
486a728b94 steam: don't use at-spi2-atk alias 2019-10-19 19:29:37 -04:00
worldofpeace
ed48341148
Merge pull request #67806 from rnhmjoj/arx 
arx-libertatis: 2019-02-16 -> 2019-07-22
 2019-10-19 23:25:54 +00:00
Martin Weinelt
648082e566 steam: add at_spi2_atk to chrootenv 
This is required for the new Stellaris 2.4 series launcher
 2019-10-19 10:58:09 -07:00
rnhmjoj
4af7f6321e
arx-libertatis: 2019-02-16 -> 2019-07-22 2019-10-19 10:41:36 +02:00
rnhmjoj
152402b528
arx-libertatis: use wrapQtAppsHook 2019-10-19 10:41:35 +02:00
R. RyanTM
2a0b29992a odamex: 0.7.0 -> 0.8.1 (#69718) 
* odamex: 0.7.0 -> 0.8.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/odamex/versions

* odamex: revamp

+ use pname and version
+ not broken anymore
+ restrict to Linux (never built on Darwin)
+ add wxGTK to build odalaunch client
 2019-10-18 18:27:05 +02:00
MicrosoftTakeover
8479d2b54d
minetest 5.0.1 -> 5.1.0 2019-10-16 13:41:14 -07:00
Frederik Rietdijk
12441bdf9f Merge staging-next into staging 2019-10-16 11:17:12 +02:00
Robin Gloster
e05e991514
Merge pull request #71054 from MicrosoftTakeover/patch-1 
scummvm: 2.0.0 -> 2.1.0
 2019-10-15 23:41:32 +02:00
Vladimír Čunát
4e6826a3b2
Merge branch 'staging-next' 
It's not perfect, but I think we can deal with the rest of the
regressions directly on master, so that this process does not stall.
 2019-10-13 16:10:58 +02:00
gnidorah
84c09b109e openxray: init at 510 2019-10-13 16:09:20 +02:00
Vladimír Čunát
b5697c6954
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1548439
 2019-10-13 13:31:33 +02:00
MicrosoftTakeover
2753998d6f
scummvm: 2.0.0 -> 2.1.0 
Needs curl for cloud saving support.

dontDisableStatic flag is added since the ./configure script didn't
recognize --disable-static flag added by default.
 2019-10-12 13:13:08 -07:00
R. RyanTM
57f698434a crispyDoom: 5.6 -> 5.6.3 (#69496) 
* crispyDoom: 5.6 -> 5.6.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/crispy-doom/versions

* crispy-doom: 5.6.2 -> 5.6.3
 2019-10-12 15:58:46 +02:00
Herwig Hochleitner
f3366d27f5 sauerbraten: 5000 -> 5492 
fixes https://github.com/NixOS/nixpkgs/issues/45088
cc @raskin
 2019-10-12 14:57:28 +02:00
Jan Tojnar
e2e3861d6b
Merge branch 'staging-next' into staging 2019-10-12 00:51:55 +02:00
Jan Tojnar
6c8aed6391
Merge branch 'master' into staging-next 2019-10-12 00:50:21 +02:00
R. RyanTM
3269a58a1b wesnoth: 1.14.7 -> 1.14.9 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wesnoth/versions
 2019-10-11 12:04:04 +02:00
Renaud
a07a926c04
Merge pull request #69984 from r-ryantm/auto-update/tintin 
tintin: 2.01.8 -> 2.01.90
 2019-10-09 18:21:22 +02:00
Robin Gloster
356464388f
Merge pull request #69370 from chkno/no-extra-flags 
makeWrapper: Remove unused extraFlagsArray feature
 2019-10-09 01:32:28 +02:00
Linus Heckemann
5aa4b19946 treewide: mark some broken packages as broken 
Refs:
e6754980264fe927320d5ff2dbd24ca4fac9a160
1e9cc5b9844ef603fe160e9f671178f96200774f
793a2fe1e8bb886ca2096c5904e1193dc3268b6d
c19cf65261639f749012454932a532aa7c681e4b
f6544d618f30fae0bc4798c4387a8c7c9c047a7c
 2019-10-08 17:14:26 +02:00
Jan Tojnar
b3fcd9375d
Merge branch 'master' into staging-next 2019-10-03 01:47:08 +02:00