nixpkgs/pkgs
Thomas Tuegel 1d5a9c0fab kde5: fix merge conflicts from master
The last merge from master into closure-size obliterated all my
closure-size fixes for KDE 5! Luckily, I had them backed-up in another
branch.
2016-03-09 06:49:44 -06:00
..
applications Merge master into closure-size 2016-03-08 09:58:19 +01:00
build-support Merge master into closure-size 2016-03-08 09:58:19 +01:00
data Merge master into closure-size 2016-03-08 09:58:19 +01:00
desktops kde5: fix merge conflicts from master 2016-03-09 06:49:44 -06:00
development perl merge fixup 2016-03-08 09:59:12 +01:00
games Merge master into closure-size 2016-03-08 09:58:19 +01:00
misc Merge master into closure-size 2016-03-08 09:58:19 +01:00
os-specific Merge master into closure-size 2016-03-08 09:58:19 +01:00
servers Merge master into closure-size 2016-03-08 09:58:19 +01:00
shells bash-interactive: better split doc stuff 2016-03-08 09:59:24 +01:00
stdenv Merge master into closure-size 2016-03-08 09:58:19 +01:00
test
tools staruml: fix evaluation on closure-size 2016-03-08 11:34:52 -06:00
top-level Merge master into closure-size 2016-03-08 09:58:19 +01:00