Arseniy Seroka c0727fb751 Merge pull request #7788 from Lassulus/charybdis ... add charybdis nixos module		2015-05-11 12:57:58 +03:00
..
applications	thunderbird: Update to 31.6.0	2015-05-11 11:46:57 +02:00
build-support	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00
data	man-pages 3.83 -> 4.00	2015-05-10 13:46:02 +02:00
desktops	kde4.kopete: fix build	2015-05-07 21:49:54 -05:00
development	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
games	Update LiquidWar	2015-05-10 13:46:31 +02:00
misc	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
os-specific	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
servers	Merge pull request #7788 from Lassulus/charybdis	2015-05-11 12:57:58 +03:00
shells
stdenv	Merge pull request #7740 from dezgeg/arm	2015-05-07 20:53:07 +02:00
test
tools	ceph: 0.94.1 -> 0.94.1.1	2015-05-11 01:29:17 -07:00
top-level	Merge pull request #7788 from Lassulus/charybdis	2015-05-11 12:57:58 +03:00