about summary refs log tree commit diff
path: root/pkgs/tools/graphics
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-01-20 19:39:28 +0100
committerVladimír Čunát <vcunat@gmail.com>2014-01-20 19:39:28 +0100
commitac6761c9081134baaa7dae18f06cbfaca38270d5 (patch)
treea1ff0e93e8907624d65aff367496513d3dc47374 /pkgs/tools/graphics
parent177667eea987898097e854a54962ff90bbf4fa35 (diff)
parent8088837dc8f35ef7853787f88bb1db7248900cc4 (diff)
downloadnixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar
nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.gz
nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.bz2
nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.lz
nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.xz
nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.tar.zst
nixlib-ac6761c9081134baaa7dae18f06cbfaca38270d5.zip
Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r--pkgs/tools/graphics/logstalgia/default.nix (renamed from pkgs/tools/graphics/logstalgica/default.nix)0
1 files changed, 0 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/logstalgica/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index bdde9daea9f1..bdde9daea9f1 100644
--- a/pkgs/tools/graphics/logstalgica/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix