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

1169 Commits

Author SHA1 Message Date
Martin Milata
65050cd7e5 firebird-emu: use qt5's mkDerivation 2020-04-22 15:23:10 +02:00
Martin Milata
f9ef2c194a yabause: use qt5's mkDerivation 2020-04-22 15:21:49 +02:00
Omoroca13
56ab879c3f pcsx2 unstable-2020-01-05 -> 1.6.0-rc 2020-04-22 11:48:05 +02:00
Frederik Rietdijk
803b3d296c Merge staging-next into staging 2020-04-21 08:29:51 +02:00
Pierre Bourdon
1b89bffcf4
libtxc_dxtn{,_s2tc}: remove from nixpkgs + hardware.opengl options 
Context: discussion in https://github.com/NixOS/nixpkgs/pull/82630

Mesa has been supporting S3TC natively without requiring these libraries
since the S3TC patent expired in December 2017.
 2020-04-20 03:19:41 +02:00
Jan Tojnar
4b706490da
Merge branch 'staging-next' into staging 2020-04-16 10:10:38 +02:00
AndersonTorres
187718251e higan: 106 -> 110 2020-04-15 12:27:44 -03:00
AndersonTorres
f902068aff ppsspp: 1.9.3 -> 1.9.4 2020-04-15 00:56:15 -03:00
AndersonTorres
d35e691ffa atari++: 1.81 -> 1.83 2020-04-14 20:59:35 -03:00
John Ericson
c8a6ea5161 Merge remote-tracking branch 'upstream/master' into staging 2020-04-13 22:17:15 -04:00
gnidorah
171e99adb2
mame: 0.219 -> 0.220 (#84978) 2020-04-13 20:01:10 -04:00
Matthew Bauer
e520d6af29
Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020 
Cross compilation fixes [april 2020]
 2020-04-13 16:48:38 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Michele Guerini Rocco
f1addf3220
Merge pull request #83193 from JoshuaFern/patch-2 
citra: 2019-10-05 -> 2020-03-21
 2020-04-10 14:41:08 +02:00
R. RyanTM
de718a0574 mednafen: 1.22.2 -> 1.24.1 2020-04-09 10:38:39 -07:00
Aaron Andersen
555bdfdd42
Merge pull request #84405 from ashkitten/update-dolphin 
dolphinEmuMaster: 5.0-11608 -> 5.0-11824
 2020-04-09 08:43:28 -04:00
Anderson Torres
52a2005e7c
Update pkgs/misc/emulators/stella/default.nix 
Co-Authored-By: Christoph Neidahl <christoph.neidahl@gmail.com>
 2020-04-09 08:44:30 -03:00
Anderson Torres
1bfdc132e2
Update default.nix 2020-04-08 15:49:46 -03:00
AndersonTorres
4a68f9de50 stella: 4.1.1 -> 6.1.1 2020-04-07 11:29:47 -03:00
Anderson Torres
5040cd56b0
atari800: 4.0.0 -> 4.2.0 
* atari800: 4.0.0 -> 4.2.0

* Update pkgs/misc/emulators/atari800/default.nix

Co-Authored-By: Ryan Mulligan <ryan@ryantm.com>

* Update pkgs/misc/emulators/atari800/default.nix

Co-Authored-By: Ryan Mulligan <ryan@ryantm.com>

Co-authored-by: Ryan Mulligan <ryan@ryantm.com>
 2020-04-06 22:09:52 -07:00
Matthew Bauer
7d278d7e33 retroarch: add wayland dependency and fix cross 
- Need custom pkg-config setting
- add wayland & libxkbcommon
 2020-04-05 21:37:45 -04:00
ash lea
03f3d67e94 dolphinEmuMaster: 5.0-11608 -> 5.0-11824 2020-04-05 15:20:22 -07:00
Frederik Rietdijk
866c5aa090 Merge master into staging-next 2020-04-05 08:33:39 +02:00
Anderson Torres
6620221782
openmsx: 2017-11-02 -> 0.15.0 (#83900) 2020-04-04 18:29:15 -04:00
Jan Tojnar
7c0a76d85e
dolphinEmuMaster: use Nix's libusb 
We were passing libusb-compat instead of libusb1, and the former no longer propagates the latter, so Dolphin built its vendored libusb.
 2020-04-04 09:07:07 +02:00
Jan Tojnar
99fbfef024
dolphinEmu: Fix build 
It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.

While at it, also move cmake to nativeBuildInputs.
 2020-04-04 09:06:39 +02:00
Jan Tojnar
a0739823bd
dolphinEmu: format with nixpkgs-fmt 2020-04-04 08:59:25 +02:00
Matthew Bauer
8e3c712e24
Merge pull request #83891 from matthewbauer/retroarch-fix-macos 
retroarch/cores.nix: use correct platform for darwin
 2020-03-31 22:05:36 -05:00
Matthew Bauer
eb84499355 retroarch/cores.nix: use correct platform for darwin 
This should fix the regression found in
https://hydra.nixos.org/eval/1577308#tabs-now-fail. The libretro
scripts use “osx” as the identifier for macOS, and “unix” seems to
mean linux.

If anyone could help out by confirming this works. I don’t currently
have access to a macOS machine.
 2020-03-31 15:07:57 -04:00
Ryan Mulligan
97f404147e
Merge pull request #82993 from Synthetica9/homepage-fix2 
treewide: fix redirected urls (again)
 2020-03-30 13:40:46 -07:00
Dmitry Kalinkin
296f7e69be
Merge pull request #82764 from avnik/wine-update 
Wine update
 2020-03-30 14:42:25 -04:00
Alexander V. Nikolaev
ca008fe328 wine{Unstable,Staging}: 5.4 -> 5.5 2020-03-29 21:06:35 +03:00
Jörg Thalheim
fd708a3fe0
Merge pull request #83638 from veprbl/pr/higan_darwin_fix 
higan: fix darwin build
 2020-03-29 06:42:33 +01:00
Dmitry Kalinkin
4c931a8217
higan: fix darwin build 2020-03-28 21:48:56 -04:00
Dmitry Kalinkin
97530e119f
Merge pull request #83469 from veprbl/pr/mame_darwin_fix 
mame: add darwin support
 2020-03-28 18:24:43 -04:00
Benjamin Hipple
b96cdee097
Merge pull request #82998 from OPNA2608/update-rpcs3 
rpcs3: 0.0.6-8187-790962425 -> 0.0.8-9300-341fdf7eb
 2020-03-27 21:57:07 -04:00
Patrick Hilhorst
5b49816cf4
treewide: add quotes to recently-changed urls 
Co-Authored-By: Drew <drewrisinger@users.noreply.github.com>
 2020-03-28 00:05:50 +01:00
Dmitry Kalinkin
39921bd43b
mame: add darwin support 2020-03-27 14:30:38 -04:00
Dmitry Kalinkin
db4bbfff66
Merge pull request #81421 from gnidorah/mame 
mame: 0.218 -> 0.219
 2020-03-27 00:35:48 -04:00
Kolby Crouch
1dc1789806 retroarch: fix picodrive on aarch64 2020-03-23 14:17:25 -05:00
Joshua Fern
83616f1bc5
citra: 2019-10-05 -> 2020-03-21 
Version bump, also fixes the common qt xcb plugin error
 2020-03-23 08:41:42 +00:00
Anderson Torres
ddc74eee4f
Merge pull request #83130 from r-ryantm/auto-update/fs-uae 
fsuae: 3.0.2 -> 3.0.3
 2020-03-22 21:56:49 -03:00
R. RyanTM
d19d265bbe fsuae: 3.0.2 -> 3.0.3 2020-03-22 11:23:30 +00:00
Matthew Bauer
ed46adb48b retroarch/cores.nix: use correct license for gw 
This should be zlib the license, not zlib the package.
 2020-03-21 23:38:58 -04:00
Matthew Bauer
a8a0cb147f retroarch: remove macOS app support 
This is badly out of date so requires extra work to get working.

Anyway, you can still use it without the menu, with no problem.
 2020-03-21 23:36:54 -04:00
Matthew Bauer
f094e132e2 retroarch/cores.nix: cleanup 
- Avoid using overrides unless necessary
- Set platform and ARCH by default
- Don’t set dontConfigure unless absolutely necessary
- Use preBuild instead of overriding entire configurePhase
 2020-03-21 23:01:01 -04:00
Matthew Bauer
d513980ea6 retroarch: 1.8.4 -> 1.8.5 2020-03-21 22:59:18 -04:00
Matthew Bauer
e1cab10dcd Revert " Fix init" 
This reverts commit e68a4094d2.
 2020-03-21 22:58:58 -04:00
Christoph Neidahl
f028498f63 rpcs3: 0.0.6-8187-790962425 -> 0.0.8-9300-341fdf7eb 2020-03-20 14:59:31 +01:00
Patrick Hilhorst
9fc5e7e473
treewide: fix redirected urls (again) 
Ran the same script as #78265.
Additionally, manually replaced `http://goodies.xfce.org`
with https.
 2020-03-20 13:36:23 +01:00
Alexander V. Nikolaev
bcb29ee284 wineUnstable: 5.3 -> 5.4 2020-03-16 15:42:02 +02:00
Alexander V. Nikolaev
25e844db9a wine{Unstable,Staging}: 5.0 -> 5.3 2020-03-16 15:40:10 +02:00
Kolby Crouch
e68a4094d2 Fix init 2020-03-15 23:57:54 -05:00
Kolby Crouch
e2b8f9f54a retroarch: 1.8.1 -> 1.8.4 2020-03-15 00:48:14 -05:00
Bignaux Ronan
5fbf8635e3
caprice32: enable freedesktop entries 2020-03-15 04:04:32 +00:00
Bignaux Ronan
be768d1ef3
caprice32: 4.5.0 -> 4.6.0 2020-03-15 04:04:09 +00:00
AndersonTorres
66bd71cf13 mednafen-server: convert meta.homepage to an explicit string 2020-03-03 09:18:04 -03:00
AndersonTorres
3867188af7 mednafen: 0.9.48 -> 1.22.2 2020-03-03 09:18:04 -03:00
AndersonTorres
b46c48c12a mednaffe: 0.8.6 -> 0.8.8 2020-03-03 09:18:04 -03:00
AndersonTorres
dbeb004e73 mgba: 0.8.0 -> 0.8.1 2020-03-02 08:44:19 -03:00
R. RyanTM
619a095af0 mgba: 0.7.3 -> 0.8.0 2020-03-01 15:23:04 -08:00
gnidorah
1cb0e94f34 mame: 0.218 -> 0.219 2020-03-01 10:51:09 +03:00
Melissa Goad
04fb02a944 mame: 0.217 -> 0.218 2020-02-13 09:28:11 -08:00
Aaron Andersen
96e5fa1ab7
Merge pull request #79474 from ashkitten/update-dolphin 
dolphinEmuMaster: 5.0-11109 -> 5.0-11608
 2020-02-09 09:05:01 -05:00
scubed2
4a4834fb1d
fceux: 2.2.3 -> 2020-01-29 (#78943) 2020-02-08 23:15:00 +01:00
ash lea
3dd336cd01 dolphinEmuMaster: 5.0-11109 -> 5.0-11608 2020-02-07 12:05:51 -08:00
Michael Raskin
ae929e63b4
Merge pull request #78406 from helsinki-systems/wine-certs 
wine: Look for root certs at $NIX_SSL_CERT_FILE
 2020-01-30 20:19:56 +00:00
Christoph Hrdinka
6ec88282af
Merge pull request #78493 from r-ryantm/auto-update/attract-mode 
attract-mode: 2.2.0 -> 2.6.1
 2020-01-29 10:07:27 +01:00
Bernardo Meurer
58bd466099
wine-{unstable,staging}: 5.0-rc6 -> 5.0 2020-01-27 20:26:22 -08:00
Bernardo Meurer
8db6255e7e
wine-stable: 4.0.3 -> 5.0 2020-01-27 20:26:22 -08:00
R. RyanTM
72e6912b4d attract-mode: 2.2.0 -> 2.6.1 2020-01-26 02:07:47 +00:00
Janne Heß
d4149412ce wine: Look for root certs at $NIX_SSL_CERT_FILE 
Closes #78365
 2020-01-24 12:22:45 +01:00
Bernardo Meurer
af34067529
winetricks: 20190912 -> 20191224 2020-01-20 01:21:12 -08:00
Bernardo Meurer
f3410e914c
wine-{unstable,staging}: 5.0-rc2 -> 5.0-rc6 2020-01-20 01:21:12 -08:00
Bernardo Meurer
ed1b996fef
wine-mono: 4.9.3 -> 4.9.4 2020-01-20 01:21:12 -08:00
Bernardo Meurer
2708dfa249
wine-gecko: 2.47 -> 2.47.1 2020-01-20 01:21:12 -08:00
Matthew Bauer
d7627dd2df
Merge pull request #77520 from thefloweringash/libretro-snes9x-src 
libretro.snes9x: 29b78d -> 04692e
 2020-01-13 11:47:32 -05:00
Graham Christensen
aafb982e03
Merge pull request #75438 from avnik/wine-update 
wine: 4.0.2 -> 4.0.3, 4.17 -> 4.21
 2020-01-11 17:06:55 -05:00
Aaron Andersen
fabd3f506c
Merge pull request #75413 from aanderse/pcsx2 
pcsx2: 1.4.0 -> unstable-2020-01-05
 2020-01-11 10:42:06 -05:00
Andrew Childs
03c4361599 libretro.snes9x: 29b78d -> 04692e 
Upstream has broken git history [1], so the current version cannot be
fetched. The required patches have been upstreamed [2], and we hope
that upstream will be more careful with their git history.

The previous commit can still be viewed on github [3], but is not the
ancestor of any fetchable ref.

[1] https://github.com/libretro/snes9x/issues/199
[2] https://github.com/snes9xgit/snes9x/pull/588
[3] 29b78df8c9
 2020-01-11 23:01:40 +09:00
Jonathan Ringer
26b0bb11de mupen64plus: 2.5 -> 2.5.9, target x86_64-linux only 2020-01-09 11:39:32 -08:00
Aaron Andersen
d30de7887a pcsx2: 1.4.0 -> unstable-2020-01-05 2020-01-08 14:01:36 -05:00
Robin Gloster
006242fd5a
treewide: fix types for mkDerivation params 2019-12-31 01:23:19 +01:00
Maximilian Bosch
81ffabdf4f
treewide: use flat lists for *Inputs, fix env usage 2019-12-31 01:13:55 +01:00
Robin Gloster
f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Frederik Rietdijk
6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Franz Pletz
7cf1d11a3e
emulationstation: fix build w/ recent versions of gcc 2019-12-30 03:07:44 +01:00
gnidorah
2435e8bf22 mame: 0.216 -> 0.217 2019-12-28 20:09:29 +01:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
Alexander V. Nikolaev
ada23cd771 wineUnstable: 5.0-rc1 -> 5.0-rc2 2019-12-22 14:39:36 +02:00
Alexander V. Nikolaev
dbc1a45631 wineUnstable: 4.21 -> 5.0-rc1 
Staging also updated
 2019-12-22 14:39:21 +02:00
Jan Tojnar
76c526a4fb
Merge pull request #75909 from jtojnar/gtkglext-fix 
Do not depend on pangox_compat
 2019-12-20 01:14:08 +01:00
Peter Hoeg
a71a2ee654 ppsspp: 1.4.2 -> 1.9.3 2019-12-19 15:15:56 +01:00
Jan Tojnar
c3bc037920
desmume: drop unneeded pangox_compat 
It was probably needed before gtkglext propagated it.
 2019-12-19 01:01:21 +01:00
Lassulus
f061413686
Merge pull request #74722 from gnidorah/mame 
mame: 0.215 -> 0.216
 2019-12-17 07:57:54 +01:00
Alexander V. Nikolaev
9452c65ce0 wine: 4.0.2 -> 4.0.3, 4.17 -> 4.21 2019-12-10 12:15:09 +02:00
gnidorah
09f5d77faa mame: 0.215 -> 0.216 2019-12-09 00:08:10 +03:00
Orivej Desh
42ac6c797b fuse-emulator: init at 1.5.7 2019-12-08 13:27:14 +00: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
Jonathan Ringer
0c1c18ca44
Merge branch 'master' into staging-next 2019-11-27 22:57:50 -08:00
R. RyanTM
4445dea280 fsuae: 3.0.0 -> 3.0.2 2019-11-25 18:14:11 -08:00
Frederik Rietdijk
06a054e6eb Merge master into staging-next 2019-11-25 21:51:57 +01:00
Herwig Hochleitner
6e38def213 cdemu: 3.2.2 -> 3.2.3 2019-11-25 04:32:45 +01:00
John Ericson
814f9104d7
Merge pull request #72657 from cleverca22/vc4 
Initial implementation of vc4 cross-compile
 2019-11-24 16:04:15 -05:00
John Ericson
d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson
9b090ccbca treewide: Get rid of most parseDrvName without breaking compat 
That is because this commit should be merged to both master and
release-19.09.
 2019-11-24 17:22:28 +00:00
Michael Bishop
4aa1ffae04
initial implementation of vc4 cross-compile 2019-11-19 22:19:15 -04:00
Frederik Rietdijk
5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
Frederik Rietdijk
be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
Kolby Crouch
08a897676b retroarch: 1.7.8.4 -> 1.8.1 2019-11-16 11:31:38 +01:00
Frederik Rietdijk
c6e31d0767 Merge master into staging-next 2019-11-14 13:31:39 +01:00
Lucas Franceschino
0ac7bb6328 ppsspp: use qt5's mkDerivation 2019-11-13 18:52:31 -05:00
Frederik Rietdijk
73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
adisbladis
7668f680da
libretro: Dont use libGLU_combined 2019-11-09 10:34:52 +00:00
adisbladis
5e433b48dc
retroarch: Don't use libGLU_combined 2019-11-09 10:34:49 +00:00
ash lea
9f2d73ae48 dolphinEmuMaster: 5.0-10879 -> 5.0-11109 2019-11-06 22:27:42 -08:00
Franz Pletz
8dca8b9ccb
Merge remote-tracking branch 'origin/master' into gcc-9 2019-11-05 01:07:22 +01:00
Matthew Bauer
5ae0b8fd9e
Merge pull request #72566 from kolbycrouch/master 
retroarch: update cores
 2019-11-04 10:41:13 -05:00
gnidorah
f73694a64a mess: drop 
MAME and MESS are now combined as one distribution as of the 0.162 release and offered as a MAME binary (MESS is included in the build).
 2019-11-03 20:02:16 +03:00
gnidorah
d296e58f6d mame: init at 0.215 2019-11-03 20:02:11 +03:00
Franz Pletz
2acbd1bb8e
citra: 2019-05-25 -> 2019-10-05 2019-11-03 14:26:33 +01:00
Kolby Crouch
eb4dd1794d retroarch: update cores 2019-11-02 06:16:10 -05:00
Alexey Shmalko
b3675878af
Merge pull request #71981 from Lassulus/vbam 
vbam: 2.1.3 -> 2.1.4
 2019-10-26 15:17:18 +03:00
lassulus
b34046859f vbam: 2.1.3 -> 2.1.4 2019-10-26 13:17:17 +02:00
Guillaume Bouchard
4a2475c924 epsxe: fix link with openssl (#71920) 
* epsxe: fix link with openssl

Epsxe is hardcoded to build with openssl-1.0 (using libcrypto.so.1.0.0),
but current nixpkgs contains openssl-1.1, which provides
libcrypto.so.1.1.

This patchs just uses the previous version of the library.

* epsxe: use autoPatchelfHook instead of manual rpath overriding

This simplifies the file AND generates failures at build time if a
needed dynamic library is not found during build time.
 2019-10-25 19:51:37 +02:00
Marek Mahut
b02ae8e22c
Merge pull request #71041 from nyanloutre/fs_uae_3_0_0 
fs-uae: 2.8.4 -> 3.0.0
 2019-10-16 21:58:02 +02:00
Renaud
75ebc76ea8
Merge pull request #69624 from r-ryantm/auto-update/libdsk 
libdsk: 1.5.10 -> 1.5.12
 2019-10-12 23:23:24 +02:00
nyanloutre
75f52e12f0
fs-uae: 2.8.4 -> 3.0.0 2019-10-12 18:34:11 +02:00
marius851000
2718c41712 faudio, wine, vkd3d: add faudio 19.10 and vkd3d 1.1 to wine 
fixes https://github.com/NixOS/nixpkgs/pull/68952
 2019-10-12 14:57:28 +02:00
Herwig Hochleitner
39b7c7e688 wine: unstable 4.16 -> 4.17 
also mono 4.9.2 -> 4.9.3
 2019-10-12 14:57: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
R. RyanTM
11c93653c7 mgba: 0.7.2 -> 0.7.3 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mgba/versions
 2019-10-07 10:05:12 -07:00
Linus Heckemann
91ceb6b997 treewide: fix dead anonscm.debian.org links 2019-10-04 12:42:21 +02:00
Linus Heckemann
c6be8bfc10 desmume: copy debian patches 
Obtained from
http://deb.debian.org/debian/pool/main/d/desmume/desmume_0.9.11-3.diff.gz
since desmume never moved to salsa.debian.org (previously on
anonscm.debian.org as a subversion repo)
 2019-10-04 12:03:09 +02:00
Joachim F
ad773d31e2
Merge pull request #69345 from joachifm/feat/split-version 
Replace uses of splitString for splitting version strings
 2019-09-27 06:19:18 +00:00
R. RyanTM
50a34183ea libdsk: 1.5.10 -> 1.5.12 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libdsk/versions
 2019-09-26 19:03:25 -07:00
Joachim Fasting
bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions 
Quoting from the splitString docstring:

   NOTE: this function is not performant and should never be used.

This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
 2019-09-26 17:42:49 +02:00
Bjørn Forsman
bf7a1d6afe retroarch: 1.7.5 -> 1.7.8.4 
Fixes missing GUI elements.
 2019-09-26 08:11:32 +02:00
Tadeo Kondrak
82428b32b9
wine{Unstable,Staging}: 4.14 -> 4.16 2019-09-14 03:05:51 -06:00
Tadeo Kondrak
e3da137708
winetricks: 20190615 -> 20190912 2019-09-14 03:05:47 -06:00
Aaron Andersen
4ece8498dc dolphinEmu: fix broken build 2019-09-09 22:48:32 -04:00
volth
7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next 
Fixed trivial conflicts caused by removing rec.
 2019-09-06 03:20:09 +02:00
Jan Tojnar
72e7d569a7
tree-wide: s/GTK+/GTK/g 
GTK was renamed.
 2019-09-06 02:54:53 +02:00
Frederik Rietdijk
ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
worldofpeace
fa29f98bb5
Merge pull request #67368 from tadeokondrak/wine-4.0.2 
wine{,-mono,-unstable,-staging}: update
 2019-08-27 15:05:07 -04:00