Michael Raskin
a3843455c5
Re-add HTTP/HTTPS support back to Subversion by adding serf. Tested.
2013-12-30 23:33:22 +04:00
Michael Raskin
64361fd269
Update SlimerJS to 0.9.0 release
2013-12-30 23:33:22 +04:00
Peter Simons
ac692ddb50
haskell-cabal2nix: update to version 1.57
2013-12-29 12:26:07 +01:00
Peter Simons
a5d046d007
cabal2nix: the test suite compiles only on GHC 7.6.x or later
...
See <https://github.com/sol/doctest-haskell/issues/69 > for further details.
2013-12-29 12:26:07 +01:00
Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Moritz Ulrich
e87515e519
Opam 1.1: Constrain supported ocaml versions.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:43:23 +01:00
Malcolm Matalka
545216ee02
Opam: Update to 1.1.0
...
Also keeps 1.0 for backwards compatibility.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-25 14:18:28 +01:00
Peter Simons
47816b4bd4
haskell-uuagc: update to version 0.9.50.2
2013-12-23 22:30:43 +01:00
Peter Simons
44a9fc6fcb
haskell-timeplot: update to version 1.0.23
2013-12-23 22:30:43 +01:00
Mathijs Kwik
cf9cc60a8d
bison: use gz tarball, early stdenv does not have xz
2013-12-23 10:25:17 +01:00
Peter Simons
cd73e1cefa
haskell-uuagc: update to version 0.9.50.1
2013-12-20 10:45:56 +01:00
Peter Simons
95d31aa306
haskell-HaRe: update to version 0.7.0.9
2013-12-19 11:35:26 +01:00
Nixpkgs Monitor
05288d3ad5
findbugs: update from 1.3.2 to 2.0.3
2013-12-18 18:18:27 +02:00
Nixpkgs Monitor
8d2d9f6d21
docutils: update from 0.10 to 0.11
2013-12-18 18:18:25 +02:00
Nixpkgs Monitor
32b2973807
ccache: update from 3.1.7 to 3.1.9
2013-12-18 18:18:21 +02:00
Nixpkgs Monitor
fe6522309e
bison3: update from 3.0 to 3.0.2
2013-12-18 18:18:19 +02:00
Nixpkgs Monitor
37d39237ab
avrdude: update from 5.11 to 6.0.1
2013-12-18 18:18:18 +02:00
Nixpkgs Monitor
8970fb09ab
autogen: update from 5.17 to 5.18
2013-12-18 18:18:17 +02:00
Peter Simons
45e8de9a7d
Merge branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Jason "Don" O'Conal
2b65900e75
vagrant: update to 1.4.0
2013-12-16 04:50:22 +00:00
Nixpkgs Monitor
53754a0397
help2man: update from 1.40.8 to 1.43.3
2013-12-15 13:03:15 +02:00
Nixpkgs Monitor
38803914d6
doxygen: update from 1.8.3.1 to 1.8.5
2013-12-15 12:32:24 +02:00
Nixpkgs Monitor
680a6380c8
cppcheck: update from 1.53 to 1.62
2013-12-15 12:26:24 +02:00
Nixpkgs Monitor
202ea363c4
astyle: update from 2.02.1 to 2.04
2013-12-15 11:25:54 +02:00
Nixpkgs Monitor
672999a3d4
oprofile: update from 0.9.8 to 0.9.9
2013-12-14 17:59:57 +02:00
Vladimír Čunát
0fe37b7519
Merge #1269 : add vagrant
2013-12-14 11:03:21 +01:00
Nixpkgs Monitor
537a5d4b70
gdb: update from 7.6.1 to 7.6.2
2013-12-14 04:36:56 +02:00
Nixpkgs Monitor
904ee6d5d2
re2c: update from 0.13.5 to 0.13.6
2013-12-14 00:41:47 +02:00
Petr Rockai
f9d66c239e
lcov: Update to 1.10 as 1.9 fails with gcc 4.7 .gcno files.
2013-12-13 20:56:36 +02:00
Nixpkgs Monitor
e0ae2b01e6
gnome.gnome_doc_utils: update from 0.20.7 to 0.20.10
2013-12-12 03:11:35 +02:00
Nixpkgs Monitor
8cfaf0697c
global: update from 6.2.2 to 6.2.9
2013-12-12 03:11:34 +02:00
Nixpkgs Monitor
57826becea
gengetopt: update from 2.22.5 to 2.22.6
2013-12-12 03:11:34 +02:00
Peter Simons
2bc29e4e6d
Merge branch 'master' into stdenv-updates.
2013-12-10 22:29:20 +01:00
Peter Simons
a47b25da5b
haskell-keter: update to version 1.1.0.1
2013-12-10 20:41:39 +01:00
Peter Simons
486e7736df
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
Peter Simons
6dfc18dc00
gnumake: add version 4.0
2013-12-09 16:14:41 +01:00
Peter Simons
aa58b5f571
gnumake: clean up directory structure; no functional change
2013-12-09 16:09:33 +01:00
Pascal Wittmann
799062bcb6
Fixed sbt options
2013-12-08 20:03:17 +01:00
Jason "Don" O'Conal
1d7108d5f5
drush: add expression
2013-12-05 04:38:35 +00:00
Peter Simons
c32bf83301
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/interpreters/perl/5.16/default.nix
pkgs/tools/networking/curl/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-python.nix
pkgs/top-level/release-small.nix
pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Peter Simons
fd5f6e81f6
haskell-cabal2nix: update to version 1.56
2013-12-03 22:23:22 +01:00
Peter Simons
64feb74f44
happy: update to version 1.19.2
2013-12-03 22:23:19 +01:00
Peter Simons
07ce265406
alex: update to version 3.1.3
2013-12-03 22:23:19 +01:00
Eelco Dolstra
bc3c49ce9b
valgrind: Update to 3.9.0
2013-12-03 09:17:49 -05:00
Peter Simons
066c03f5a1
haskell-hlint: update to version 1.8.55
2013-12-02 16:26:24 +01:00
Jason "Don" O'Conal
b3504c7bf5
complexity: fix build
2013-11-28 23:52:49 +00:00
Jason "Don" O'Conal
c5bc23a259
vagrant: add expression
2013-11-27 23:05:14 +00:00
Peter Simons
99a4fcfc1b
haskell-hdevtools: re-generate expression with cabal2nix
2013-11-26 21:09:24 +01:00
Peter Simons
b20b8b9844
happy: update to version 1.19.1
2013-11-26 21:09:18 +01:00
Peter Simons
09c50d6f9c
alex: update to version 3.1.2
2013-11-26 21:09:17 +01:00
Peter Simons
8aa2de3e1d
Merge pull request #1256 from tomberek/add_hdevtools
...
Add hdevtools
2013-11-26 00:48:21 -08:00
Michael Raskin
5c90e785b2
Updating LuaRocks to 2.1.1
2013-11-25 10:59:38 +04:00
Michael Raskin
940c52f4c3
Update SlimerJS - there is still no fresh release for xulrunner 25
2013-11-25 10:59:37 +04:00
Shea Levy
7ab7be0cc3
Add automake 1.14
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-23 21:18:37 -05:00
Thomas Bereknyei
53f05a812f
Add hdevtools
...
4 spaces per indent
2013-11-23 16:12:21 -05:00
Song Wenwu
61b8ebc77f
swig: bump 2.0.4 -> 2.0.11
2013-11-22 09:41:17 +08:00
Bjørn Forsman
04ce6241ac
lttv: update 1.5-beta1 -> 1.5
...
This makes lttv build again with the new GTK+ version that was recently
updated in nixpkgs.
2013-11-15 00:19:15 +01:00
Bjørn Forsman
fbfa569efd
stlink: fix chroot build
...
Add sha256 attribute to fetchgit to make it a fixed-output derivation
(needed for chroot builds).
2013-11-13 23:30:47 +01:00
Bjørn Forsman
a8d63681db
stlink: fix package name
...
To stop nixpkgs-lint from saying "stlink: package has no version".
2013-11-13 23:25:48 +01:00
Peter Simons
20b512de7c
haskell-keter: update to version 1.0.1.2
2013-11-11 14:39:58 +01:00
Bjørn Forsman
f4f18c11b6
uhd: bump 3.5.2 -> 3.5.4
...
It seems upstream changed the hash of the 3.5.2 archive so it doesn't
build anymore. Bump it instead of just updating the hash.
2013-11-10 16:22:38 +01:00
Bjørn Forsman
e0b7eeb0ad
uhd: new package
...
UHD is USRP Hardware Driver (for Software Defined Radio).
2013-11-09 22:15:52 +01:00
Moritz Ulrich
698065715a
Leiningen: Update to 2.3.3
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-08 21:30:34 +01:00
Lluís Batlle i Rossell
3e8e635be7
Updating gdb to 7.6.1
2013-11-08 17:27:57 +01:00
Eelco Dolstra
58af4fb11e
Update some more platforms
2013-11-06 10:58:20 +01:00
Rickard Nilsson
2d44f3e8af
sbt: Update to 0.13.0
...
Also remove all old sbt versions, and rename package to
sbt instead of simple-build-tool. sbt seems to be
the correct name for this package.
2013-11-05 14:51:14 +01:00
Eelco Dolstra
a0e21fd1ca
Mark more packages as broken
2013-11-04 21:11:00 +01:00
Mathijs Kwik
609f8dc04b
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Peter Simons
86443f4efd
haskell-cabal2nix: update to version 1.55
2013-10-31 09:02:25 +01:00
Michael Raskin
92e3206c2a
Updating SlimerJS to Git version for compatibility with fresh xulrunner
2013-10-31 02:59:45 +04:00
Domen Kožar
09fa7304ae
ninka: update to 1.1 and refactor
2013-10-30 11:47:12 +01:00
Michael Raskin
52d5290118
Update SlimerJS
2013-10-30 13:03:47 +04:00
Peter Simons
d64917ad17
Back-port Haskell-related improvements from stdenv-updates.
...
* There now is full support for building Haskell packages as shared libraries
for GHC versions 7.4.2 or later. The Cabal builder recognizes the following
attributes:
- enableSharedLibraries configures Cabal to build of shared libraries in
addition to static ones. This option requires that all dependencies of
the package have been compiled for use in shared libraries, too.
- enableSharedExecutables configures Cabal to prefer shared libraries when
linking executables.
The default values for these attributes are arguments to the haskellPackages
expression.
* Haskell builds now run in a LANG="en_US.UTF-8" environment to avoid plenty
of build and test suite errors. Without this setting, GHC seems unable to
deal with the UTF-8 character encoding that's generally considered standard
in the Haskell world.
* The Cabal builder supports a new attribute 'testTarget' to specify the exact
set of tests to be run during the check phase.
* The ghc-wrapper attribute ghcVersion has been removed. Instead, we use the
ghc.version attribute, which exists in unwrapped GHC derivations, too.
2013-10-27 10:09:36 +01:00
Peter Simons
91f2c362de
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Bjørn Forsman
a13ed71b43
xc3sprog: new package
...
xc3sprog is command-line tools for programming FPGAs, microcontrollers
and PROMs via JTAG.
Homepage: http://xc3sprog.sourceforge.net/
I'm using the latest from subversion as xc3sprog doesn't seem to make
proper releases. There are only a few seemingly random snapshots at
sourceforge. And these snapshots are built binary packages, not source
archives.
NOTE: I haven't tested this on any hardware yet.
2013-10-26 12:43:12 +02:00
Peter Simons
1b86a6d399
haskell-HaRe: update to version 0.7.0.7
2013-10-24 23:29:55 +02:00
Michael Raskin
5bbb1f77b2
Adding SlimerJS — script-driven Gecko browser
2013-10-21 00:30:39 +04:00
Michael Raskin
20e8f46022
Updating luarocks to 2.1.0
2013-10-20 21:08:09 +04:00
Michael Raskin
96585205d7
Updating CL-Launch to 3.22.1
2013-10-20 21:07:48 +04:00
Michael Raskin
be5b32e798
Apparently fix texinfo5 with fresh TeXLive
2013-10-20 19:15:11 +04:00
Peter Simons
fae8fd8ef1
ghc-wrapper: rename 'ghcVersion' attribute to 'version' for consistency
2013-10-20 15:40:36 +02:00
Peter Simons
6be8ad3392
Merge branch 'origin/master' into stdenv-updates.
...
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Peter Simons
4dee7de246
haskell-packunused: update to version 0.1.0.1
2013-10-14 08:46:31 +02:00
Eelco Dolstra
df0d362f31
Fix some more Hydra evaluation errors
2013-10-08 11:07:14 +02:00
Bjørn Forsman
083d0890f5
More description fixes
...
* Remove package name
* Start with upper case letter
* Remove trailing period
Also reword some descriptions and move some long descriptions to
longDescription.
I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Bjørn Forsman
28ac782583
Some description fixes
...
There are many more packages to fix, this is just a start.
Rules:
* Don't repeat the package name (not always that easy...)
* Start with capital letter
* Don't end with full stop
* Don't start with "The ..." or "A ..."
I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Peter Simons
ac5d5297dd
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-10-02 22:44:12 +02:00
Peter Simons
3a8c00c00d
haskell-HaRe: update to version 0.7.0.6
2013-10-02 22:33:42 +02:00
Jason "Don" O'Conal
d4ba98abc9
phantomjs: add openssl to rpath
2013-10-02 05:17:32 +00:00
Moritz Ulrich
f09dca7d60
Leiningen: Update to 2.3.2 (& add GnuPG to closure)
2013-09-30 19:11:19 +00:00
Song Wenwu
d4c222dd34
gradle: update to 1.8
2013-09-29 21:40:17 +02:00
Peter Simons
b15c3e49e5
texinfo: remove obsolete version 4.9
2013-09-28 10:37:05 +02:00
Peter Simons
8ff3855204
texinfo: update to version 5.2
2013-09-28 10:36:34 +02:00
aszlig
9170351e69
ninja: Update to new upstream version 1.4.0.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-27 15:23:30 +02:00
Moritz Ulrich
36fca94805
Fix some issues in my packages reported by nixpkgs-lint.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-26 20:03:57 +00:00
Peter Simons
01c91a7fa1
haskell-hlint: update to version 1.8.53
2013-09-25 18:25:00 +02:00
Peter Simons
9407832de4
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Peter Simons
e4f6e4b15d
gnum4: drop obsolete patches
2013-09-22 16:35:54 +02:00
Peter Simons
ee3dc2d0c9
gnum4: fix download URL
2013-09-22 16:32:26 +02:00
Peter Simons
8d6b23a60a
gnum4: update to version 1.4.17
2013-09-22 16:27:44 +02:00
Rok Garbas
7350100fa2
phantomjs: upgrade to 1.9.2
2013-09-19 01:57:58 +02:00
Peter Simons
651b94fd32
haskell-keter: update to version 1.0.1.1
2013-09-18 17:17:32 +02:00
Peter Simons
54124516de
haskell-happy: add version 1.19.0
2013-09-18 17:17:31 +02:00
Peter Simons
5bc2f6ce02
haskell-alex: add version 3.1.0
2013-09-18 17:17:31 +02:00
Peter Simons
07ec0d7cef
haskell-HaRe: update to version 0.7.0.5
2013-09-18 17:17:31 +02:00
Vladimír Čunát
2c7c65595d
Revert "binutils: minor update 2.23.1 -> .2"
...
This reverts commit 15f96c840f
.
See #909 .
Conflicts (trivial, auto-resolved):
pkgs/development/tools/misc/binutils/default.nix
2013-09-16 15:53:40 +02:00
Peter Simons
b962caede7
bison-3.x: fix build for good this time
...
- Bison 3.x no longer compiles without Perl.
- Don't try to run the test suite unless flex is available.
2013-09-15 22:05:16 +02:00
Peter Simons
24366adf19
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-14 15:28:40 +02:00
Krofek
51f63b1d03
Merge branch 'master' of https://github.com/Krofek/nixpkgs
2013-09-14 00:28:27 +02:00
Krofek
da21a852c3
gtkdialog: update to 0.8.3
2013-09-14 00:10:17 +02:00
Rickard Nilsson
45b8a1b1ff
avrdude: Update to version 5.11
2013-09-13 00:28:02 +02:00
Peter Simons
6fff4c01e8
haskell-HaRe: update to version 0.7.0.4
2013-09-12 19:27:25 +02:00
Peter Simons
edfefa6167
gnulib: update to version 0.0-8015-gf0aab22
2013-09-12 12:22:17 +02:00
Peter Simons
a1cca8226a
happy: add version 1.18.11
2013-09-11 19:58:34 +02:00
Mathijs Kwik
2f428bbb46
Merge remote-tracking branch 'official/master' into stdenv-updates
2013-09-11 10:56:47 +02:00
Peter Simons
445aa49c71
bison: prefer the tar.gz variant of the sources
...
Apparently, the bootstrapping stdenv cannot unpack xz-compressed tarfiles.
2013-09-11 10:55:23 +02:00
Vladimír Čunát
aa8e8303e1
Merge branch 'x-updates' into master
2013-09-11 08:37:03 +02:00
Peter Simons
09477f6002
haskell-HaRe: update to version 0.7.0.2
2013-09-09 15:07:36 +02:00
Peter Simons
6451264e63
Drop obsolete versions of flex: we only used the latest one, 2.5.35.
2013-09-09 10:39:56 +02:00
Peter Simons
701937b085
binutils: remove unused flex2535, bc, and dejagnu arguments
2013-09-09 10:34:37 +02:00
Peter Simons
a4531a5dd5
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-09 09:51:12 +02:00
Peter Simons
c8c7a8dc42
haskell-keter: update to version 1.0.1
2013-09-08 22:56:29 +02:00
Peter Simons
b68dfd49c7
haskell-splot: re-generate expression with cabal2nix
2013-09-08 22:56:25 +02:00
Peter Simons
3d2caf1180
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-08 22:54:35 +02:00
Peter Simons
aa0df547a8
bison-3.x: fix test suite by adding flex as a build input
2013-09-08 21:12:34 +02:00
Vladimír Čunát
c1ed13dad0
Merge branch 'master' into x-updates
2013-09-08 12:04:20 +02:00
Gergely Risko
38d54cfc21
Update splot to 0.3.11, so it compiles again
2013-09-07 20:55:42 +02:00
Vladimír Čunát
9766dbb1df
dejagnu: minor update
2013-09-07 16:20:39 +02:00
Vladimír Čunát
b1be46e932
Merge branch 'master' into x-updates
2013-09-07 16:19:46 +02:00
Peter Simons
222cf9a8fc
haskell-HaRe: jailbreak to support recent versions of Diff and hspec
2013-09-06 23:35:12 +02:00
Peter Simons
b94cf8c733
haskell-HaRe: update to version 0.7.0.1
2013-09-06 23:35:11 +02:00
Peter Simons
908e0cc23d
haskell-uuagc-cabal: update to version 1.0.5.0
2013-09-06 23:35:10 +02:00
Bjørn Forsman
86c7583ab4
lttng: 2.2.x -> 2.3.0
2013-09-05 22:46:07 +02:00
Vladimír Čunát
c074433fc6
binutils: add support for x86_64 in i686 builds ( close #857 )
...
Also some style refactoring around repeating "stdenv.lib.optional*".
The author of the idea is @errge.
2013-09-02 22:03:43 +02:00
Vladimír Čunát
74488e2b58
Merge branch 'x-updates' into stdenv-updates
...
Conflicts (simple):
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
Peter Simons
3031968b0c
haskell-timeplot: re-generate with cabal2nix
2013-09-02 14:05:25 +02:00
Gergely Risko
05fd8db379
Update timeplot to 1.0.22 to fix building with Chart-1.0
2013-09-02 11:36:54 +02:00
Bjørn Forsman
36564b72fe
uncrustify: new package
...
Uncrustify is a source code beautifier for C, C++, C#, ObjectiveC, D,
Java, Pawn and VALA.
Homepage: http://uncrustify.sourceforge.net/
2013-08-31 09:42:20 +02:00
Peter Simons
4cb183dd88
haskell-uuagc: update to version 0.9.50
2013-08-30 10:53:03 +02:00
Peter Simons
85a6660d08
haskell-hslogger: update to version 1.2.3
2013-08-30 10:53:03 +02:00
Peter Simons
98fcc2f746
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-08-30 10:45:11 +02:00
Vladimír Čunát
2fda1165da
Merge branch 'master' into x-updates
2013-08-28 10:37:41 +02:00
aszlig
35229f0cf4
boomerang: Refactor and fix build.
...
Thanks to @phreedom for reporting the broken URL used fetchgit, which
was because I deleted my fork repository. Fortunately, in the meantime
other forks got to a more "working" state and being more actively
maintained than my fork. So that's why I switched using @nemerle's fork
now, as it is the the most usable one out there, at least in our case.
One stupid thing I've done in the first place was to use "1.0pre" as the
version and the fork uses "alpha 0.3.2", so it essentially is some kind
of a "downgrade" if you just look at the version.
Fortunately, peer-unreviewed research based on guesswork has shown that
I'm the only one using Boomerang on NixOS, so this shouldn't have a big
impact on the other non-existent users.
Also, this drops dependencies on boehmgc and cppunit, because building
with either one or both will fail at the moment.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-27 04:39:33 +02:00
Peter Simons
9ac8ea937c
Merge branch 'origin/master' into stdenv-updates.
2013-08-26 12:21:23 +02:00
Peter Simons
5ba7c2a24f
haskell-cabal2nix: update to version 1.54
2013-08-24 13:00:43 +02:00
Peter Simons
db9383d93b
haskell-hslogger: update to version 1.2.2
2013-08-24 13:00:43 +02:00
Peter Simons
eb703936d0
haskell-cabal2ghci: update to version 0.0.1.1
2013-08-24 13:00:43 +02:00
Peter Simons
fe2acafee7
haskell-hlint: update to version 1.8.51
2013-08-24 13:00:42 +02:00
Peter Simons
b92c0c2896
haskell-SourceGraph: delete obsolete package
...
This library hasn't compiled in ages.
2013-08-24 13:00:41 +02:00
Vladimír Čunát
c1e62e7e91
Merge branch 'master' into x-updates
2013-08-22 19:29:09 +02:00