Shea Levy 025770fdd9 Merge branch 'pkg/netatop-0.7' of git://github.com/mayflower/nixpkgs		2016-01-07 14:36:51 -05:00
..
applications	Merge branch 'rm-notbit' of git://github.com/jgillich/nixpkgs	2016-01-07 14:34:40 -05: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	xcodeenv: make it work with xcode 7.2	2016-01-07 14:43:17 +00:00
games	anki: disable version check	2016-01-05 21:44:54 +01:00
misc	vimPlugins: update 2016-01-05	2016-01-05 19:58:30 +03:00
os-specific	Merge branch 'pkg/netatop-0.7' of git://github.com/mayflower/nixpkgs	2016-01-07 14:36:51 -05:00
servers	axis2: 1.6.3 -> 1.6.4	2016-01-07 05:59:15 +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	Merge pull request #12198 from mayflower/remove-upstart-layer	2016-01-07 13:47:39 -05:00
top-level	Merge branch 'rm-notbit' of git://github.com/jgillich/nixpkgs	2016-01-07 14:34:40 -05:00