JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,372 Commits 2 Branches 0 Tags 13 GiB
735bbda892
Commit Graph

19834 Commits

Author SHA1 Message Date
Matthew Bauer
a79ff78ec4 nspr: fix darwin build 
- needs CoreServices
 2016-08-16 19:25:44 +00:00
Matthew Bauer
3182e52fdd libstatgrab: fix darwin build 
Darwin needs IOKit to work.
 2016-08-16 19:25:43 +00:00
Matthew Bauer
de914d0190 libsecret: fix darwin build 
darwin needs the -lintl flag
 2016-08-16 19:25:42 +00:00
Matthew Bauer
483a480cea libomxil-bellagio: disable on Darwin 
I can't find any information on this for Darwin. It appears to be
Linux-only.
 2016-08-16 19:25:42 +00:00
Matthew Bauer
122bac8f26 libfreefare: fix darwin build 2016-08-16 19:25:42 +00:00
Matthew Bauer
0edb35ad78 glew110: fix darwin build 2016-08-16 19:25:40 +00:00
Matthew Bauer
5ba0165034 gegl: fix darwin build 2016-08-16 19:25:40 +00:00
Matthew Bauer
410fa4b427 fox: fix darwin build 2016-08-16 19:25:40 +00:00
Matthew Bauer
7afc589d7d dclxvi: fix darwin build 2016-08-16 19:25:40 +00:00
Matthew Bauer
58eb27f5ed boringssl: fix darwin build 
Add -Wno-error to make clang happy. Seems impossible to keep both gcc and clang happy.
 2016-08-16 19:25:40 +00:00
Julien Dehos
1d6464003f wt: init at 3.3.6 2016-08-16 21:01:45 +02:00
Julien Dehos
703ca63b01 cxxtools: init at 2.2.1 2016-08-16 15:41:21 +02:00
Nathan Zadoks
874e90fd66 protobuf: 3.0.0-beta-3.1 -> 3.0.0 2016-08-16 12:09:36 +02:00
Josef Kemetmüller
24ab0460a9 armadillo: Fix failing build (#17764) 
The upgrade of cmake to v3.6.0 broke this build. HDF5 now can
only be found if hdf5-cpp is used as buildInput.
However the upgrade made it possible to remove a patch:
CMake can now find openblas on its own.
 2016-08-16 06:29:15 +00:00
Shea Levy
9adad8612b Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs" 
Was meant to go into staging, sorry

This reverts commit 57b2d1e9b0, reversing
changes made to 760b2b9048.
 2016-08-15 19:05:52 -04:00
Nikolay Amiantov
5b296a1470 Merge branch 'master' into staging 2016-08-15 10:34:28 +03:00
Robin Gloster
792ba4a466 libbsd: remove unnecessary patchPhase 
`substituteInPlace` was operating on a non-existant file.
 2016-08-14 22:55:21 +00:00
Robin Gloster
4cbcab54a6 Revert "libtorrentRasterbar_1_09: remove, not used anymore" 
This reverts commit dd3142a14e.
 2016-08-14 21:31:06 +00:00
Franz Pletz
dd3142a14e libtorrentRasterbar_1_09: remove, not used anymore 
Last package depengin on it was removed in #17737.
 2016-08-14 22:51:59 +02:00
Nikolay Amiantov
0e72026f3e xgboost: 2016-05-14 -> 0.60 2016-08-14 22:37:08 +03:00
Nikolay Amiantov
0464600859 ipopt: 3.12.4 -> 3.12.6 2016-08-14 22:37:08 +03:00
Nikolay Amiantov
9fea2698c0 libvdpau-va-gl: 0.3.6 -> 0.4.0 2016-08-14 22:37:08 +03:00
Nikolay Amiantov
552f63ab8e folly: 2016-04-29 -> 2016.08.08.00 2016-08-14 22:37:08 +03:00
Nikolay Amiantov
f54188e659 cppzmq: 2016-01-20 -> 2016-07-18 2016-08-14 22:37:07 +03:00
Dan Peebles
1f0df5f21f jemalloc: remove symbol prefix on darwin 
The default darwin build added a je_ prefix to all exported symbols, and
that broke downstream consumers that were not expecting the prefix, like
mariadb.
 2016-08-14 15:08:23 -04:00
Vladimír Čunát
344c672bb5 libdrm: 2.4.68 -> 2.4.70 2016-08-14 15:20:19 +02:00
Shea Levy
a34cc59605 icu: 56.1 -> 57.1 2016-08-14 07:59:57 -04:00
Frederik Rietdijk
53c6d4827b Merge pull request #17716 from teh/master 
Add libdynd and dynd-python
 2016-08-14 13:53:59 +02:00
Vladimír Čunát
433670eb3f Merge #17495: mesa: 11.2.2 -> 12.0.1 
It also contains some refactoring of the expression.
 2016-08-14 12:27:01 +02:00
Vladimír Čunát
4fbb37c517 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1287298
 2016-08-14 12:02:28 +02:00
Vladimír Čunát
4bceaca196 Re-merge #17112: fftw: 3.3.4 -> 3.3.5 
By mistake in df2102b6a2 I merged an older version of the PR
so we only had an -RC version; I'm sorry.
 2016-08-14 11:43:00 +02:00
Qingping Hou
f6f186d161 protobuf: remove new lines to keep style consistent 2016-08-13 23:35:55 -07:00
Qingping Hou
6f3f10490e protobuf: add 3.0.0b2 
For tensorflow
 2016-08-13 23:35:55 -07:00
Tom Hunger
371d17960d libdynd: init at 0.7.2 2016-08-13 18:24:17 +01:00
Tim Cuthbertson
5164b2dec3 gdbm: enable compatibility layer for dbm (#17063) 2016-08-13 11:12:26 +02:00
Damien Cassou
eafdae9fd5 Merge pull request #17687 from DamienCassou/update-gnome3.20-packages-august 
Update gnome3.20 packages august
 2016-08-13 09:00:21 +02:00
rnhmjoj
7d0f05f22c
mesa: 11.2.2 -> 12.0.1 2016-08-13 03:46:47 +02:00
obadz
f279b253d5 pokerth: init at 1.1.1 2016-08-13 01:40:16 +01:00
obadz
1bc03a7b33 libircclient: init at 1.9 2016-08-13 01:40:16 +01:00
Lluís Batlle i Rossell
17f0cce445 Adding the mlt version that matches kdenlive 15.12. 
(cherry picked from commit 008f88ae6f0aa43cf0dc4e36f059ee03e1a0b99b)
 2016-08-12 15:38:04 +02:00
Ram Kromberg
2c81c24fa6 libsidplayfp: init at 1.8.6 
Fixes #17542.

@fpletz: Removed unnecessary autotools dependencies.
 2016-08-12 14:22:09 +02:00
Damien Cassou
8cac3752f1 libraw: propagate lcms2 so gegl finds it 2016-08-12 14:12:36 +02:00
Damien Cassou
bcb8e76619 gegl: add missing libraw dependency 2016-08-12 14:11:53 +02:00
Damien Cassou
6a19f72458 appstream-glib: 0.5.11 -> 0.5.12 2016-08-12 12:13:02 +02:00
Damien Cassou
a00a2466b6 Merge pull request #17246 from DamienCassou/vtk-7.0.0 
vtk: 5.10.1 -> 7.0.0
 2016-08-12 10:02:27 +02:00
Michael Raskin
01b3f3d00b mdds: 0.12.1 -> 1.2.1 2016-08-11 18:49:18 +02:00
Michael Raskin
44760fca8e libre: 0.4.16 -> 0.4.17 2016-08-11 18:49:18 +02:00
Michael Raskin
62564d8bec libmwaw: 0.3.7 -> 0.3.8 2016-08-11 18:49:18 +02:00
Michael Raskin
a5d752c630 libatomic_ops: 7.4.2 -> 7.4.4 2016-08-11 18:49:18 +02:00
Michael Raskin
6536d6fe9c mdds: 0.12.0 -> pinned 0.12.1, use it for libreoffice-still instead of freshest 2016-08-11 18:49:18 +02:00
Robin Gloster
40d217b90e Merge pull request #17657 from matthewbauer/darwin-misc 
Darwin misc. fixes
 2016-08-11 16:41:34 +00:00
Michael Raskin
30c2a168ce botanUnstable: 1.11.29 -> 1.11.30 2016-08-11 17:57:35 +02:00
Michael Raskin
258f45082e botan: 1.10.12 -> 1.10.13 2016-08-11 17:57:35 +02:00
Eelco Dolstra
6aabe2e4bb nss: 3.24 -> 3.26 2016-08-11 15:20:35 +02:00
Daiderd Jordan
53b60c8873 Merge pull request #17316 from the-kenny/rustc-beta-1.11.0 
rustcBeta: Fix build
 2016-08-11 12:22:17 +02:00
Frederik Rietdijk
24fc76e600 Merge pull request #17653 from mbakke/gpshell 
Add GlobalPlatform tools
 2016-08-11 09:08:58 +02:00
Matthew Bauer
db89bdcab0 alure: only build on linux 2016-08-10 22:29:45 -05:00
Marius Bakke
82e2e6e92d
gppcscconnectionplugin: init at 1.1.0 2016-08-11 00:11:12 +01:00
Marius Bakke
67b16f0f85
globalplatform: init at 6.0.0 2016-08-11 00:11:01 +01:00
Vladimír Čunát
947abb08ac Merge branch 'staging' 2016-08-10 22:09:38 +02:00
Moritz Ulrich
3cfe3ab6b6 libgit2: Disable Security.framework transport on Darwin. 
When used by cargo, `libgit2` crashes with a Segmentation Fault on
Darwin. This crash is somehow connected to the `Security.framework`
native to Darwin, and while being easy to reproduce, is very hard to
track down.

This commit introduces a patch to `libgit2` which disables the
troublesome transport and instead depends on `libcurl`. The patch also
adds support for `SSL_CERT_FILE` to `libgit2`.

Upstream tracking issue is
https://github.com/libgit2/libgit2/issues/3885.
 2016-08-10 21:16:37 +02:00
Matthias C. M. Troffaes
ad27f0252e wolfssl: 3.9.6 -> 3.9.8 2016-08-10 11:02:55 +01:00
Robin Gloster
b08247f1e4 ptlib: 2.10.10 -> 2.10.11, add check for SSLv3 2016-08-10 07:12:08 +02:00
Franz Pletz
347c1ed8a0 libshout: 2.3.1 -> 2.4.1 2016-08-10 07:12:08 +02:00
Daiderd Jordan
c31f05e063 Merge pull request #17577 from LnL7/darwin-ffmpeg 
ffmpeg: add extra darwin framework for 3.1
 2016-08-09 08:13:11 +02:00
Thomas Tuegel
ca5b3368ca qttools: fix CMake paths 
Fixes #17585.
 2016-08-08 08:52:45 -05:00
Eelco Dolstra
2d71df18d3 Merge pull request #17588 from rnhmjoj/nss 
nss: 3.23 -> 3.24
 2016-08-08 12:11:26 +02:00
Daiderd Jordan
0456264754 Merge pull request #17517 from knedlsepp/add-json 
nlohmann_json: init at 2.0.2
 2016-08-08 00:29:09 +02:00
rnhmjoj
f2842da8b2
nss: 3.23 -> 3.24 2016-08-07 23:38:03 +02:00
Vladimír Čunát
24805b00c0 unixODBCDrivers.mariadb: fix evaluation 
... after the parent merge, but the package was broken anyway.
 2016-08-07 22:33:19 +02:00
Vladimír Čunát
950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Daiderd Jordan
e2fdd74a41
libsamplerate: fix missing darwin frameworks 2016-08-07 18:20:17 +02:00
Daiderd Jordan
b660ed3258
libmikmod: fix missing darwin framework 2016-08-07 17:52:06 +02:00
Daiderd Jordan
00b05d47d3
ffmpeg: add extra darwin framework for 3.1 2016-08-07 12:27:05 +02:00
Vladimír Čunát
50f909cf93 mesa: have vdpau drivers in lib/vdpau again 
This was done by @abbradar 364f297bb2 but I lost that change by accident
when doing large closure-size merges 39ebb01d.
Fortunately it seems to have caused no problems, likely because
${mesa_drivers}/lib gets into $LD_LIBRARY_PATH.
 2016-08-07 12:14:16 +02:00
Vladimír Čunát
03e32315a5 Merge branch 'master' into staging 
Hydra nixpkgs: ?compare=1286624
 2016-08-07 11:35:28 +02:00
Vladimír Čunát
73e1242172 mesa: vdpau symlinks, broken after 1a52fdc 
Fixes #17559.
Using *relative* symlinks doesn't break when moving the files.
 2016-08-07 11:33:20 +02:00
Vladimír Čunát
a1b0967fa0 gtk3: maintenance 3.20.6 -> 3.20.8 2016-08-06 18:47:51 +02:00
Tuomas Tynkkynen
89c867196c SDL2_{gfx,image,net}: Broken on Darwin 
Last successful Darwin build was 11 months ago, presumably nobody cares.

http://hydra.nixos.org/build/38317749
http://hydra.nixos.org/build/38318268
http://hydra.nixos.org/build/38322306
 2016-08-06 18:27:20 +03:00
Tuomas Tynkkynen
ea14f5c86d http-parser: Broken on Darwin 
http://hydra.nixos.org/build/38320273
 2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen
0498573573 drumstick: Broken on i686 
http://hydra.nixos.org/build/38323068
 2016-08-06 17:06:45 +03:00
Tuomas Tynkkynen
3c513ebc13 assimp: Broken on Darwin 
http://hydra.nixos.org/build/38315116
 2016-08-06 17:06:45 +03:00
Joachim F
af8b7d3a28 Merge pull request #17526 from RamKromberg/fix/wavpack 
wavpack: 4.75.0 -> 4.80.0
 2016-08-06 00:59:08 +02:00
Ram Kromberg
76c2988e33 wavpack: 4.75.0 -> 4.80.0 2016-08-05 13:54:56 +03:00
Josef Kemetmueller
54748c1e3f nlohmann_json: init at 2.0.2 
A header only C++ library for modern JSON.
 2016-08-04 23:34:23 +02:00
koral
b3beab9f03 webkitgtk: 2.10.4 -> 2.10.9 2016-08-04 21:18:38 +02:00
Thomas Tuegel
5b008e30b4 kdeWrapper: avoid excessive file collisions 2016-08-04 10:40:36 -05:00
Tobias Geerinckx-Rice
37528197a3
libpsl: 0.13.0 -> 0.14.0 2016-08-03 20:02:25 +02:00
Joachim F
70bf931498 Merge pull request #17410 from knedlsepp/motif-on-darwin 
motif: Add support for darwin
 2016-08-03 18:31:43 +02:00
Michael Raskin
ef46388c48 neovim-qt: 0pre -> 0.2.1, use libmsgpack 1.4 2016-08-03 17:58:22 +02:00
Alexey Shmalko
61a5c24209 cmocka: cross-compilation support (#17462) 2016-08-03 08:16:01 +02:00
Tuomas Tynkkynen
16d48b8280 Re-enable bunch of packages on Darwin 
Prior to 1bf5ded193 these contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
 2016-08-03 00:55:42 +03:00
Tuomas Tynkkynen
dc26ac6e04 libmng: Re-enable on Darwin 
Prior to 1bf5ded193 this contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
 2016-08-02 23:10:31 +03:00
Franz Pletz
9cfcf90832 libressl: 2.3.6 -> 2.3.7, 2.4.1 -> 2.4.2 
Version 2.2.x is removed because it is not maintained by upstream anymore.
 2016-08-02 21:21:02 +02:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
102ffa6be7 treewide: Wrap some really long package descriptions 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
63de40099f treewide: Move some meta sections to end-of-file 
That seems to be the overwhelming convention.
 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta 
Build-tested on x86_64 Linux and on Darwin.
 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms 
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
 2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
b96fe03484 treewide: Fix meta.platforms related typos 2016-08-02 21:17:44 +03:00
Damien Cassou
8e3120bb7e gdcm: 2.4.6 -> 2.6.4 2016-08-02 19:57:40 +02:00
Damien Cassou
acc07df736 pcl: 1.7.2 -> 1.8.0 2016-08-02 19:57:40 +02:00
Damien Cassou
d8e0ce402e vtk: 5.10.1 -> 7.0.0 2016-08-02 19:57:40 +02:00
Gabriel Ebner
dc01684799 Merge branch 'master' into staging 2016-08-02 18:40:34 +02:00
Frederik Rietdijk
0af0a20e1d Merge pull request #17140 from michelk/gdal/update 
gdal: 2.0.2 -> 2.1.1
 2016-08-02 10:57:25 +02:00
Thomas Tuegel
3445ab79a2 qt57.poppler: fix build 
Packages that depend on Qt >= 5.7 must build using the C++11 standard.
 2016-08-01 18:06:10 -05:00
Kranium Gikos Mendoza
7f3ca5d75b leatherman: disable curl test to fix build 2016-08-01 19:20:45 +08:00
Josef Kemetmueller
ee16dba630 motif: Add darwin support 2016-07-31 20:21:24 +02:00
Thomas Tuegel
ac98cc4d94 Merge pull request #17402 from ttuegel/plasma-closure-size 
Plasma closure size
 2016-07-31 10:29:07 -05:00
Vladimír Čunát
df2102b6a2 Merge #17112: fftw: 3.3.4 -> 3.3.5 2016-07-31 17:28:50 +02:00
Vladimír Čunát
c20f0f4462 Merge branch 'master' into staging 2016-07-31 17:28:25 +02:00
obadz
0d259f841b aws-sdk-cpp: add compile flag -fpermissive due to libcurl upgrade 
curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and
therefore requires the followin flag until this package gets updated
 2016-07-31 15:03:50 +01:00
Bart Brouns
b25aeb8e7f fftw: 3.3.4 -> 3.3.5 2016-07-31 13:05:38 +02:00
Thomas Tuegel
ab58794838 kdeWrapper: assume empty path list by default 2016-07-30 17:25:29 -05:00
Thomas Tuegel
f7d98785d5 breeze-icons: don't propagate qtsvg build input 
breeze-icons does not have a separate dev output, so this pulls
qtsvg.dev into the closure.
 2016-07-30 17:22:04 -05:00
Thomas Tuegel
d1d38f2888 kdeWrapper: include wrappers in path 2016-07-30 17:07:19 -05:00
Thomas Tuegel
22bc6f01cf kdeEnv: use package version, not ecm version 2016-07-30 17:07:06 -05:00
Thomas Tuegel
aaf612e833 kdeDerivation: don't fail by default on library-only packages 2016-07-30 16:26:05 -05:00
Thomas Tuegel
c122f791c9 Add kdeEnv and kdeWrapper 2016-07-30 16:16:36 -05:00
Thomas Tuegel
e362442562 kde5: avoid propagating dev outputs to reduce closure size 2016-07-30 14:16:46 -05:00
Thomas Tuegel
d5bec1a145 kde5: rename extra-cmake-modules variants 
Instead of one package `extra-cmake-modules`, there is now `ecm` and
`ecmNoHooks`. The latter is used when one does not want to incur a Qt 5
dependency; it is also available as a top-level package
`extra-cmake-modules`.
 2016-07-30 14:06:43 -05:00
Thomas Tuegel
b390eb39ae kde5: fix extra-cmake-modules hooks 2016-07-30 09:36:52 -05:00
Gabriel Ebner
56300ee0f0 libva: set driver path correctly in minimal version 
This does not introduce a dependency on mesa, as
mesa_noglu.driverLink == "/run/opengl-driver"

Fixes #17264.
 2016-07-30 13:13:50 +02:00
Vladimír Čunát
46134cbca5 gnutls-3.3: make it build again 
At least without tests. We only have two packages using it ATM.
 2016-07-30 12:30:23 +02:00
Vladimír Čunát
dfa2f8040e Merge #17354: tcl/tk: 8.6.4 -> 8.6.6 2016-07-30 08:32:47 +02:00
Thomas Tuegel
40b838b94d kde5: fix all the Qt version dependencies 2016-07-29 21:13:00 -05:00
Thomas Tuegel
307847e6fa Merge pull request #17369 from ttuegel/qt-5.7 
qt57: init at 5.7.0
 2016-07-29 18:12:38 -05:00
Thomas Tuegel
839a543d41 qt57: init at 5.7.0 2016-07-29 17:46:13 -05:00
michael bishop
dd3e27f2e7 qt56: purge all refrences to gtk, solves all of the theme problems 2016-07-29 18:50:06 -03:00
Bart Brouns
926038ab4c fftw: fixup build of 3.3.5-rc1 2016-07-29 20:25:00 +02:00
Thomas Tuegel
2f32588a8f phonon: explicitly select Qt 4 vs. Qt 5 2016-07-29 10:29:41 -05:00
Thomas Tuegel
6c79045964 extra-cmake-modules: separate setup hook from package 2016-07-29 10:23:18 -05:00
Bart Brouns
514011abe7 fftw: 05-06-2016 -> 3.3.5-rc1 2016-07-29 17:10:10 +02:00
Thomas Tuegel
173d668456 Merge branch 'kde-frameworks-qt55' 2016-07-28 19:14:37 -05:00
Thomas Tuegel
4856a2a1ea build KDE Frameworks with each Qt version 2016-07-28 18:27:13 -05:00
Thomas Tuegel
add332c424 qt55: fix CMake module paths 2016-07-28 18:26:54 -05:00
Rahul Gopinath
0ba631d5bb tcl/tk: 8.6.4 -> 8.6.6 2016-07-28 16:19:08 -07:00
Vladimír Čunát
3a402e248f Merge branch 'staging' 
It includes a security update of libidn.
 2016-07-28 20:36:17 +02:00
Jun Hao
5bf4a9ff73 webkitgtk24x: fix libwebp missing library path, add libobjc as dependency on OSX (#17198) 2016-07-28 04:45:54 +02:00
Franz Pletz
996c9837fa Merge pull request #17322 from RamKromberg/init/motif 
motif: init at 2.3.6 & nedit: 5.6 -> 5.6a
 2016-07-28 03:53:38 +02:00
Michele Guerini Rocco
2ef1c6bbbb libmatroska: 1.4.4 -> 1.4.5 (#17310) 2016-07-28 01:08:54 +02:00
Ram Kromberg
3800bb5017 motif: init at 2.3.6 2016-07-28 01:33:45 +03:00
mimadrid
7bed99a34b libfilezilla: 0.5.3 -> 0.6.1 2016-07-27 22:48:43 +02:00
Rok Garbas
cd1dadf860 Merge pull request #17242 from rasendubi/mips-linux 
Fixes for mips-linux
 2016-07-27 19:01:11 +02:00
Michele Guerini Rocco
1a24de7c16 libebml: 1.3.3 -> 1.3.4 (#17287) 2016-07-27 18:48:22 +02:00
Michel Kuhlmann
6cf020fc29 gdal: 2.0.2 -> 2.1.1 2016-07-27 16:04:03 +02:00
Proglodyte
52d52e7f0c v8: add static config option 
Add the 'static' argument to the v8 package, which allows building the
package as a static library rather than a shared library. This allows
users to pass additional arguments to d8:
https://github.com/joestelmach/lint.vim/issues/10
 2016-07-27 01:38:52 -04:00
Benjamin Staffin
2fcd26c794 Merge pull request #13014 from Pamelloes/master 
Darwin Fixes for Mesa and Freeglut
 2016-07-26 15:54:26 -04:00
Vladimír Čunát
49ad8ce561 Merge branch 'master' into staging 2016-07-26 20:52:54 +02:00