me
/
guix
Archived
1
0
Fork 0
Commit Graph

179 Commits (8bfb0f1862dc16cff1e4b9d61feb4a8c2080ef06)

Author SHA1 Message Date
Nicolas Goaziou a2a17c3fc6
gnu: blender-2.79: Fix build.
* gnu/packages/graphics.scm (blender-2.79)[inputs]: Add pugixml.
2021-01-30 18:38:41 +01:00
Nicolas Goaziou e629d72216
gnu: blender: Fix build.
* gnu/packages/graphics.scm (openimageio): Update to 2.2.10.1.
[arguments]: Do not use system pugixml.
[inputs]: Add fmt.
* gnu/packages/graphics.scm (blender)[inputs]: Add "pugixml".
2021-01-30 17:59:34 +01:00
Antoine Côté 093bfc5d96
gnu: blender-2.79: Fix color management.
* gnu/packages/graphics.scm (blender-2.79): Fix color management.
[inputs]: Add opencolorio.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2021-01-20 14:50:15 +02:00
Christopher Lemmer Webber 2a333f2535
gnu: blender: Update to 2.91.0.
* gnu/packages/graphics.scm (blender): Update to 2.91.0.
[inputs]: Add embree.

Signed-off-by: Leo Famulari <leo@famulari.name>
2021-01-16 15:40:34 -05:00
Christopher Lemmer Webber c544cfb399
gnu: Add embree.
* gnu/packages/graphics.scm (embree): New variable.

Signed-off-by: Leo Famulari <leo@famulari.name>
2021-01-16 15:40:34 -05:00
Nicolas Goaziou 74783ba56e
gnu: directfb: Fix home page.
* gnu/packages/graphics.scm (directfb)[home-page]: Fix URL.  The previous one
was unrelated to the project.
2021-01-06 14:12:29 +01:00
Ekaitz Zarraga 708a610e45
gnu: Add coin3D@4.0.0.
* gnu/packages/graphics.scm (coin3D-4): New variable.

Signed-off-by: Leo Famulari <leo@famulari.name>
2021-01-03 19:12:38 -05:00
Tobias Geerinckx-Rice 810c185399
gnu: egl-wayland: Update to 1.1.6.
* gnu/packages/graphics.scm (egl-wayland): Update to 1.1.6.
2021-01-02 18:54:27 +01:00
Tobias Geerinckx-Rice f6167cfbc3
gnu: goxel: Update to 0.10.7.
* gnu/packages/graphics.scm (goxel): Update to 0.10.7.
2020-12-23 00:54:49 +01:00
Efraim Flashner 8ed4c468ab
gnu: Don't append '.git' to GitHub uris.
* gnu/packages/admin.scm (nmrpflash)[source]: Remove '.git' from URI.
* gnu/packages/aidc.scm (zxing-cpp),
* gnu/packages/assembly.scm (mbuild),
* gnu/packages/audio.scm (opensles, wildmidi, tinyalsa),
* gnu/packages/browser-extensions.scm (ublock-origin-chromium),
* gnu/packages/check.scm (mutest),
* gnu/packages/compression.scm (unshield),
* gnu/packages/coq.scm (subset),
* gnu/packages/dictionaries.scm (translate-shell),
* gnu/packages/disk.scm (memkind),
* gnu/packages/documentation.scm (latex2html),
* gnu/packages/emacs-xyz.scm (emacs-chronometrist,
  emacs-flycheck-ledger, emacs-counsel-notmuch, emacs-spaceline,
  emacs-org-generate),
* gnu/packages/embedded.scm (ebusd, ebusd-configuration),
* gnu/packages/enchant.scm (nuspell),
* gnu/packages/fontutils.scm (woff2),
* gnu/packages/geo.scm (memphis),
* gnu/packages/gimp.scm (mrg),
* gnu/packages/gnome-xyz.scm (gnome-shell-extension-appindicator),
* gnu/packages/gnome.scm (parlatype),
* gnu/packages/golang.scm (go-github-com-tv42-httpunix,
  go-github-com-ayufan-golang-kardianos-service),
* gnu/packages/graphics.scm (eglexternalplatform, egl-wayland, mmm,
  directfb, flux),
* gnu/packages/gstreamer.scm (openni2, ccextractor, libvisual,
  graphene),
* gnu/packages/guile-xyz.scm (guile-srfi-180, guile-torrent),
* gnu/packages/image.scm (openjpeg-data),
* gnu/packages/java.scm (javacc),
* gnu/packages/language.scm (liblouis, liblouisutdml),
* gnu/packages/linux.scm (pamela, ttyebus),
* gnu/packages/lxqt.scm (lxqt-connman-applet),
* gnu/packages/mail.scm (libetpan),
* gnu/packages/man.scm (ronn),
* gnu/packages/music.scm (tascam-gtk, artyfx),
* gnu/packages/networking.scm (srt, lksctp-tools, nng, nanomsg),
* gnu/packages/python-crypto.scm (pure-python-otr),
* gnu/packages/qt.scm (qtspell),
* gnu/packages/raspberry-pi.scm (raspi-gpio, raspi-open-firmware),
* gnu/packages/rdp.scm (freerdp),
* gnu/packages/ruby.scm (ruby-prawn-templates, ruby-treetop, ruby-gimme,
  ruby-standard, ruby-rubocop-ast, ruby-rexml, ruby-range-compressor,
  ruby-regexp-property-values, ruby-regexp-parser, ruby-rubocop,
  ruby-pdf-reader, ruby-pdf-inspector, ruby-prawn),
* gnu/packages/syncthing.scm (syncthing-gtk),
* gnu/packages/video.scm (svt-hevc, mediasdk, libvideogfx, libde265,
  tslib),
* gnu/packages/xml.scm (libxmlb, libxmlplusplus)[source]: Same.
2020-11-19 20:48:26 +02:00
Leo Famulari 29c66198f3
gnu: Blender: Update to 2.83.9.
* gnu/packages/graphics.scm (blender): Update to 2.83.9.
2020-11-15 17:56:18 -05:00
Tobias Geerinckx-Rice 79bf16f688
gnu: ogre: Update to 1.12.9.
The imgui submodule has been removed upstream.

* gnu/packages/graphics.scm (ogre): Update to 1.12.9.
[source]: Don't clone recursively.
[native-inputs]: Add dear-imgui-source.
[arguments]: Add an ‘unpack-dear-imgui’ phase.
Add IMGUI_DIR to #:configure-flags.
2020-11-15 00:12:12 +01:00
Tobias Geerinckx-Rice e23d5aa908
gnu: Add dear-imgui.
* gnu/packages/graphics.scm (dear-imgui): New public variable.
2020-11-15 00:12:12 +01:00
Gabriel Arazas 1c21468c7a
gnu: Add goxel.
* gnu/packages/graphics.scm (goxel): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2020-09-15 14:40:20 +02:00
zimoun c22c6de453
gnu: rapicorn: Use pandoc instead of ghc-pandoc.
* gnu/packages/graphics.scm (rapicorn)[native-inputs]: Replace ghc-pandoc with
pandoc.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2020-09-14 10:51:27 +02:00
Tobias Geerinckx-Rice 144d7c07ac
gnu: ogre: Update to 1.12.6.
* gnu/packages/graphics.scm (ogre): Update to 1.12.6.
2020-09-02 20:31:11 +02:00
Michael Rohleder 7e66233811
gnu: drawpile: Build with libmicrohttpd 0.9.71.
* gnu/packages/graphics.scm (drawpile): Update to 2.1.17-1.ed1a75deb.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-08-26 09:24:56 +02:00
Tobias Geerinckx-Rice cdbb0e55c1
gnu: blender: Add colour management support.
* gnu/packages/graphics.scm (blender)[inputs]: Add opencolorio.
2020-08-20 06:20:11 +02:00
Tobias Geerinckx-Rice 9c5e3fb6a5
gnu: blender: Update to 2.83.5.
* gnu/packages/graphics.scm (blender): Update to 2.83.5.
2020-08-20 05:14:15 +02:00
Raghav Gururajan 8d82df1376
gnu: Add egl-wayland.
* gnu/packages/graphics.scm (egl-wayland): New variable.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2020-08-18 23:26:18 +02:00
Raghav Gururajan e7db21bd10
gnu: Add eglexternalplatform.
* gnu/packages/graphics.scm (eglexternalplatform): New variable.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2020-08-18 23:26:17 +02:00
Raghav Gururajan 6bd347c94e
gnu: Add mmm.
* gnu/packages/graphics.scm (mmm): New variable.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2020-08-18 23:11:15 +02:00
Raghav Gururajan 286716f877
gnu: Add directfb.
* gnu/packages/graphics.scm (directfb): New variable.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2020-08-18 22:56:24 +02:00
Raghav Gururajan d54fb33ace
gnu: Add flux.
* gnu/packages/graphics.scm (flux): New variable.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2020-08-18 22:56:22 +02:00
Tobias Geerinckx-Rice 01af05bf0b
gnu: blender: Update to 2.83.4.
* gnu/packages/graphics.scm (blender): Update to 2.83.4.
2020-08-18 05:38:38 +02:00
your friendly localhost admin 9ac2a4ee34
gnu: Added drawpile (UPnP support pending) at version 2.1.17
* gnu/packages/graphics.scm (drawpile): New variable.

Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>
2020-08-13 11:02:02 +03:00
Maxim Cournoyer d6fcc67de5
gnu: lib2geom: Update to commit 17e0d21f.
* gnu/packages/patches/lib2geom-enable-assertions.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/graphics.scm (lib2geom): Update to commit
17e0d21f0afc8489656f9184bff7ad024a42394a, and remove obsolete patch.
2020-08-08 23:54:32 -04:00
Mark H Weaver 96a655a77b
gnu: Add blender@2.79b.
Restore blender@2.79b, the last version that does not require OpenGL 3,
and therefore the last version to work on many older computers.  Note
that this commit relies on blender-2.79-newer-ffmpeg.patch and
blender-2.79-python-3.7-fix.patch, which were left in the tree when
blender@2.79b was previously removed in commit
1f14453eed.

* gnu/packages/patches/blender-2.79-gcc8.patch,
gnu/packages/patches/blender-2.79-gcc9.patch,
gnu/packages/patches/blender-2.79-oiio2.patch,
gnu/packages/patches/blender-2.79-python-3.8-fix.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/graphics.scm (blender-2.79): New variable.
2020-07-31 13:38:47 -04:00
Mark H Weaver d4c9e81c07
gnu: openimageio: Update to 2.0.13.
* gnu/packages/graphics.scm (openimageio): Update to 2.0.13.
[inputs]: Replace python-2 with python-wrapper.  Add pybind11
and robin-map.
2020-07-31 13:38:40 -04:00
Maxim Cournoyer 076fd4e791
gnu: lib2geom: Fix more tests.
There were still two tests failing on aarch64-linux:

1. rotated-rect-test,
2. ellipse-test.

The first one was removed along with the RotatedRect class in latest upstream,
while the second one is yet numerical accuracy related.  It gets fixed by
updating the already existing 'lib2geom-fix-tests' patch.

* gnu/packages/graphics.scm (lib2geom): Bump revision to "2", and update
commit hash to the latest one available.
* gnu/packages/patches/lib2geom-fix-tests.patch: Update patch.
2020-07-28 00:32:00 -04:00
Tobias Geerinckx-Rice e21793fb3f
gnu: blender: Update to 2.83.3.
* gnu/packages/graphics.scm (blender): Update to 2.83.3.
2020-07-23 23:51:23 +02:00
Ludovic Courtès b0e7b6992f
gnu: Remove ".git" from "https://github/…/….git".
Until now, 'lookup-origin' and thus 'lookup-origin-revision' in (guix
swh) would sometimes return #f for these because the ".git" URLs are
redirects to the non-".git" URLs.  Consequently, 'guix lint -c archival'
would keep saying "scheduled Software Heritage archival"; likewise, the
fallback download code would fail.

* gnu/packages/ada.scm,
gnu/packages/admin.scm,
gnu/packages/aidc.scm,
gnu/packages/algebra.scm,
gnu/packages/android.scm,
gnu/packages/animation.scm,
gnu/packages/arcan.scm,
gnu/packages/assembly.scm,
gnu/packages/audio.scm,
gnu/packages/authentication.scm,
gnu/packages/avr.scm,
gnu/packages/axoloti.scm,
gnu/packages/backup.scm,
gnu/packages/bash.scm,
gnu/packages/benchmark.scm,
gnu/packages/bioconductor.scm,
gnu/packages/bioinformatics.scm,
gnu/packages/bittorrent.scm,
gnu/packages/boost.scm,
gnu/packages/build-tools.scm,
gnu/packages/c.scm,
gnu/packages/calendar.scm,
gnu/packages/cdrom.scm,
gnu/packages/check.scm,
gnu/packages/chemistry.scm,
gnu/packages/chez.scm,
gnu/packages/clojure.scm,
gnu/packages/code.scm,
gnu/packages/compression.scm,
gnu/packages/compton.scm,
gnu/packages/coq.scm,
gnu/packages/cpp.scm,
gnu/packages/cran.scm,
gnu/packages/crypto.scm,
gnu/packages/curl.scm,
gnu/packages/databases.scm,
gnu/packages/datastructures.scm,
gnu/packages/debug.scm,
gnu/packages/disk.scm,
gnu/packages/distributed.scm,
gnu/packages/django.scm,
gnu/packages/dlang.scm,
gnu/packages/dns.scm,
gnu/packages/docker.scm,
gnu/packages/education.scm,
gnu/packages/efi.scm,
gnu/packages/elixir.scm,
gnu/packages/emacs-xyz.scm,
gnu/packages/embedded.scm,
gnu/packages/emulators.scm,
gnu/packages/engineering.scm,
gnu/packages/erlang.scm,
gnu/packages/fabric-management.scm,
gnu/packages/file-systems.scm,
gnu/packages/finance.scm,
gnu/packages/firmware.scm,
gnu/packages/flashing-tools.scm,
gnu/packages/fonts.scm,
gnu/packages/fontutils.scm,
gnu/packages/fpga.scm,
gnu/packages/game-development.scm,
gnu/packages/games.scm,
gnu/packages/genealogy.scm,
gnu/packages/genimage.scm,
gnu/packages/geo.scm,
gnu/packages/gimp.scm,
gnu/packages/gl.scm,
gnu/packages/gnome-xyz.scm,
gnu/packages/gnome.scm,
gnu/packages/gnuzilla.scm,
gnu/packages/golang.scm,
gnu/packages/gpodder.scm,
gnu/packages/graph.scm,
gnu/packages/graphics.scm,
gnu/packages/graphviz.scm,
gnu/packages/groff.scm,
gnu/packages/groovy.scm,
gnu/packages/gtk.scm,
gnu/packages/guile-xyz.scm,
gnu/packages/guile.scm,
gnu/packages/hardware.scm,
gnu/packages/haskell-apps.scm,
gnu/packages/haskell-xyz.scm,
gnu/packages/hexedit.scm,
gnu/packages/i2p.scm,
gnu/packages/ibus.scm,
gnu/packages/image-processing.scm,
gnu/packages/image-viewers.scm,
gnu/packages/image.scm,
gnu/packages/ipfs.scm,
gnu/packages/java-graphics.scm,
gnu/packages/java-maths.scm,
gnu/packages/java.scm,
gnu/packages/javascript.scm,
gnu/packages/jrnl.scm,
gnu/packages/julia.scm,
gnu/packages/jupyter.scm,
gnu/packages/kodi.scm,
gnu/packages/language.scm,
gnu/packages/lego.scm,
gnu/packages/less.scm,
gnu/packages/libusb.scm,
gnu/packages/linux.scm,
gnu/packages/lirc.scm,
gnu/packages/lisp-xyz.scm,
gnu/packages/llvm.scm,
gnu/packages/logging.scm,
gnu/packages/lolcode.scm,
gnu/packages/lua.scm,
gnu/packages/lxde.scm,
gnu/packages/lxqt.scm,
gnu/packages/machine-learning.scm,
gnu/packages/mail.scm,
gnu/packages/markup.scm,
gnu/packages/maths.scm,
gnu/packages/maven.scm,
gnu/packages/mes.scm,
gnu/packages/messaging.scm,
gnu/packages/monitoring.scm,
gnu/packages/mpd.scm,
gnu/packages/music.scm,
gnu/packages/networking.scm,
gnu/packages/node-xyz.scm,
gnu/packages/ocaml.scm,
gnu/packages/ocr.scm,
gnu/packages/onc-rpc.scm,
gnu/packages/opencl.scm,
gnu/packages/opencog.scm,
gnu/packages/pantheon.scm,
gnu/packages/password-utils.scm,
gnu/packages/patchutils.scm,
gnu/packages/pdf.scm,
gnu/packages/perl6.scm,
gnu/packages/phabricator.scm,
gnu/packages/popt.scm,
gnu/packages/printers.scm,
gnu/packages/prolog.scm,
gnu/packages/protobuf.scm,
gnu/packages/pulseaudio.scm,
gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm,
gnu/packages/python-xyz.scm,
gnu/packages/qt.scm,
gnu/packages/radio.scm,
gnu/packages/rails.scm,
gnu/packages/rdf.scm,
gnu/packages/rednotebook.scm,
gnu/packages/rpc.scm,
gnu/packages/rsync.scm,
gnu/packages/ruby.scm,
gnu/packages/rust.scm,
gnu/packages/scheme.scm,
gnu/packages/screen.scm,
gnu/packages/security-token.scm,
gnu/packages/selinux.scm,
gnu/packages/serialization.scm,
gnu/packages/shells.scm,
gnu/packages/shellutils.scm,
gnu/packages/simh.scm,
gnu/packages/sml.scm,
gnu/packages/ssh.scm,
gnu/packages/statistics.scm,
gnu/packages/stenography.scm,
gnu/packages/sync.scm,
gnu/packages/syncthing.scm,
gnu/packages/synergy.scm,
gnu/packages/telephony.scm,
gnu/packages/terminals.scm,
gnu/packages/tex.scm,
gnu/packages/texinfo.scm,
gnu/packages/text-editors.scm,
gnu/packages/textutils.scm,
gnu/packages/time.scm,
gnu/packages/tmux.scm,
gnu/packages/tor.scm,
gnu/packages/toys.scm,
gnu/packages/version-control.scm,
gnu/packages/video.scm,
gnu/packages/vim.scm,
gnu/packages/virtualization.scm,
gnu/packages/vlang.scm,
gnu/packages/vnc.scm,
gnu/packages/vpn.scm,
gnu/packages/web-browsers.scm,
gnu/packages/web.scm,
gnu/packages/wireservice.scm,
gnu/packages/wm.scm,
gnu/packages/wxwidgets.scm,
gnu/packages/xdisorg.scm,
gnu/packages/xml.scm,
gnu/packages/xorg.scm,
tests/lint.scm: Remove trailing ".git" from 'git-reference' URL.
2020-07-12 23:08:15 +02:00
Marius Bakke e0bb6391a9
gnu: ilmbase: Update to 2.5.2.
* gnu/packages/patches/ilmbase-fix-test-arm.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/graphics.scm (ilmbase): Update to 2.5.2.
[source](patches): Remove 'ilmbase-fix-test-arm.patch'.
(openexr)[arguments]: Really increase test timeout, as the previous fix was
ineffective.
2020-06-27 20:08:24 +02:00
Maxim Cournoyer 620796e66b
gnu: lib2geom: Fix tests on aarch64, i686-linux architectures.
Fixes <http://issues.guix.gnu.org/41827>.

This change also removes obsolete patches.

* gnu/packages/patches/lib2geom-fix-tests.patch: New file.
* gnu/packages/patches/lib2geom-link-tests-against-glib.patch: Delete file.
* gnu/packages/patches/lib2geom-use-system-googletest.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/graphics.scm (lib2geom)[origin]: Use new patch.
2020-06-18 02:25:49 -04:00
Leo Famulari 933abfba36
gnu: Blender: Update to 2.83.0.
* gnu/packages/graphics.scm (blender): Update to 2.83.0.
2020-06-08 14:32:50 -04:00
Maxim Cournoyer 5ee8c1411d
gnu: Add autotrace.
* gnu/packages/graphics.scm (autotrace): New variable.
2020-05-31 22:12:12 -04:00
Maxim Cournoyer 2f6d51ef9a
gnu: Add pstoedit.
* gnu/packages/graphics.scm (pstoedit): New variable.
2020-05-31 22:12:12 -04:00
Maxim Cournoyer 89c34f5e48
gnu: Add lib2geom.
* gnu/packages/graphics.scm (lib2geom): New variable.
* gnu/packages/patches/lib2geom-enable-assertions.patch,
lib2geom-link-tests-against-glib.patch,
lib2geom-use-system-googletest.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register new patches.
2020-05-31 22:12:12 -04:00
Marius Bakke 91be384d2e
gnu: Remove openimageio@1.7.
* gnu/packages/graphics.scm (openimageio-1.7): Remove variable.
2020-05-11 23:49:02 +02:00
Marius Bakke b8bb2f0793
gnu: OpenEXR: Update to 2.5.0.
* gnu/packages/patches/ilmbase-openexr-pkg-config.patch: Delete file.
* gnu/packages/patches/ilmbase-fix-test-arm.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/graphics.scm (ilmbase): Update to 2.5.0.
2020-05-11 21:55:01 +02:00
Marius Bakke bdb90df764
Merge branch 'master' into core-updates 2020-04-11 00:10:23 +02:00
Raghav Gururajan eef785d668
gnu: Add fox.
* gnu/packages/graphics.scm (fox): New variable.
2020-04-09 22:34:22 +02:00
Marius Bakke 2778302399
Merge branch 'master' into core-updates
Conflicts:
	etc/news.scm
	gnu/local.mk
	gnu/packages/check.scm
	gnu/packages/cross-base.scm
	gnu/packages/gimp.scm
	gnu/packages/java.scm
	gnu/packages/mail.scm
	gnu/packages/sdl.scm
	gnu/packages/texinfo.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
2020-04-08 13:00:50 +02:00
Nicolas Goaziou e3a617feac
gnu: ogre: Update to 1.12.5.
* gnu/packages/graphics.scm (ogre): Update to 1.12.5.
[source]: Add recursive? flag.
[arguments]: Update configure flags. Add a phase to fix CMakeLists.txt. Remove
unnecessary substitution.
[native-inputs]: Replace googletest with googletest-1.8.
[inputs]: Add pugixml.
2020-04-06 02:30:16 +02:00
Marius Bakke 18af687037
Merge branch 'master' into core-updates
Conflicts:
	gnu/packages/icu4c.scm
	gnu/packages/man.scm
	gnu/packages/python-xyz.scm
	guix/scripts/environment.scm
	guix/scripts/pack.scm
	guix/scripts/package.scm
	guix/scripts/pull.scm
	guix/store.scm
2020-03-27 00:12:15 +01:00
Tanguy Le Carrour 67c8b6448e
gnu: python-pastel: Update to 0.2.0.
* gnu/packages/graphics.scm (python-pastel): Update to 0.2.0.

Signed-off-by: Leo Famulari <leo@famulari.name>
2020-03-24 17:10:19 -04:00
Marius Bakke d19b14c834
Merge branch 'master' into core-updates 2020-03-21 22:16:02 +01:00
Tobias Geerinckx-Rice 05fe0f5648
gnu: ogre: Use HTTPS home page.
* gnu/packages/graphics.scm (ogre)[home-page]: Use HTTPS.
2020-03-21 16:20:11 +01:00
Marius Bakke c4d769d359
Merge branch 'master' into core-updates 2020-03-18 19:41:08 +01:00
Marius Bakke 961d2ee269
Merge branch 'master' into core-updates 2020-03-14 13:13:40 +01:00