public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/NixOS/nixpkgs into xfce4-whiskermenu-plugin

Browse Source 
Pull from nixpkgs/master to resolve Travis CI build conflicts.
This commit is contained in:
Perry Barnoy
2015-10-19 14:10:40 -04:00
parent 3d1797160f 48d837f310
commit 7df323125f
213 changed files with 12978 additions and 1221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/maintainers.nix
+1 -1
View File
@@ -153,7 +153,7 @@
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
koral = "Koral <koral@mailoo.org>";
kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
kragniz = "Louis Taylor <kragniz@gmail.com>";
kragniz = "Louis Taylor <louis@kragniz.eu>";
ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
lassulus = "Lassulus <lassulus@gmail.com>";
layus = "Guillaume Maudoux <layus.on@gmail.com>";