public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,916 Commits 1 Branch 0 Tags 1.5 GiB
Commit Graph

3 Commits

Author SHA1 Message Date
Vladimír Čunát 09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Vladimír Čunát f306e67e15 kde5: move files around to simplify merge 
It is analogous to 98d8e1a160.
 2016-03-08 09:42:41 +01:00
Thomas Tuegel f3110c0a01 kde5.frameworks: 5.18 -> 5.19 
This will cause some merge conflicts, but the changes in closure-size
will be overwritten by the upgrade in master otherwise.
 2016-02-19 16:03:23 -06:00