Thomas Tuegel 6e44f0710a Merge pull request #10697 from bendlas/update-dropbox-master ... dropbox: 3.8.9 -> 3.10.9		2015-10-29 16:42:20 -05:00
..
applications	Merge pull request #10697 from bendlas/update-dropbox-master	2015-10-29 16:42:20 -05:00
build-support	buildRustPackage: fix erroneous /bin/sh reference	2015-10-29 15:16:51 +01:00
data	geolite-legacy 2015-10-19 -> 2015-10-27	2015-10-28 00:57:37 +01:00
desktops	kde: add glib include paths to NIX_CFLAGS_COMPILE	2015-10-25 20:03:09 +01:00
development	merlin: 2.2 -> 2.3	2015-10-29 21:35:41 +01:00
games	cuyo: init at 2.1.0	2015-10-29 16:12:45 +01:00
misc	Merge pull request #10578 from simonvandel/arc-theme	2015-10-29 17:59:42 +03:00
os-specific	reduce security setup hook duplication	2015-10-29 13:56:02 -07:00
servers	mariadb: fix multiple outputs on darwin	2015-10-29 12:52:30 -07:00
shells	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
stdenv	Move stdenv-darwin bootstrap binaries to nixos.org	2015-10-29 22:16:06 +01:00
test
tools	Merge pull request #10699 from bendlas/update-i2p	2015-10-29 19:51:57 +01:00
top-level	emacs-24-mac: propagate frameworks	2015-10-29 13:56:02 -07:00