Arseniy Seroka f3f8506461 Merge pull request #9392 from danielfullmer/zerotierone-1.4 ... zerotierone: 1.0.2 -> 1.0.4 and fix for hardcoded path		2015-08-25 20:39:06 +03:00
..
applications	Merge pull request #9426 from ebzzry/conkeror-update	2015-08-25 20:37:09 +03:00
build-support	Merge branch 'staging'	2015-08-25 14:14:54 +02:00
data	Merge branch 'staging'	2015-08-25 14:14:54 +02:00
desktops	gnome3: Depend on defaultIconTheme instead of hicolor- or adwaita	2015-08-25 14:23:10 +02:00
development	cabal2nix: update to version 20150824	2015-08-25 17:15:41 +02:00
games	micropolis: fix patch hash, probably updated	2015-08-24 08:23:44 +02:00
misc	Merge branch 'staging'	2015-08-25 14:14:54 +02:00
os-specific	Merge branch 'staging'	2015-08-25 14:14:54 +02:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-08-20 10:32:29 -07:00
shells	add binutils to bash build for size	2015-08-12 11:27:54 -07:00
stdenv	Merge branch 'master.upstream' into staging.upstream	2015-08-19 20:52:17 -07:00
test
tools	Merge pull request #9392 from danielfullmer/zerotierone-1.4	2015-08-25 20:39:06 +03:00
top-level	Merge pull request #9422 from kamilchm/glide05	2015-08-25 20:37:25 +03:00