Franz Pletz 70e47ab981 grafana: 2.5.0 -> 2.6.0		2016-01-08 17:19:02 +01:00
..
applications	Merge pull request #12227 from mogorman/jekyll	2016-01-08 10:08:07 +00:00
build-support	Force another rebuild	2016-01-07 13:21:16 +01:00
data	geolite-legacy 2015-11-23 -> 2016-01-06	2016-01-06 11:59:54 +01:00
desktops	kde5: plasma-5.5.2 -> plasma-5.5.3	2016-01-06 17:29:46 -06:00
development	hackage-packages.nix: update Haskell package set	2016-01-08 15:52:22 +01:00
games	rigsofrods: remove dead package	2016-01-08 01:36:32 +01:00
misc	Merge pull request #12140 from bendlas/update-wine	2016-01-08 01:46:38 +03:00
os-specific	Merge pull request #12178 from mdorman/revert-iptables	2016-01-08 10:45:53 +01:00
servers	grafana: 2.5.0 -> 2.6.0	2016-01-08 17:19:02 +01:00
shells	fish: fix merge conflict	2016-01-05 23:32:29 +01:00
stdenv	stdenv-darwin: allow easier testing of bootstrap tools	2016-01-03 21:47:09 -05:00
test
tools	borgbackup: 0.27.0 -> 0.29.0	2016-01-08 01:36:32 +01:00
top-level	Merge pull request #12067 from mdorman/shotwellupdate	2016-01-08 11:07:46 +01:00