koral 81549b0136 Added jellyfish python package.		2015-05-10 13:46:00 +02:00
..
applications	z3 opt	2015-05-10 13:46:00 +02:00
build-support	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00
data	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
desktops	kde4.kopete: fix build	2015-05-07 21:49:54 -05:00
development	no longer need to patch reactive-banana, latest version has all the necessary instances	2015-05-10 13:46:00 +02:00
games	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
misc	Merge remote-tracking branch 'upstream/master' into staging	2015-05-07 01:44:49 -07:00
os-specific	phc-intel: don't try to build on _grsec kernels	2015-05-10 13:46:00 +02:00
servers	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00
shells	pythonPackages.ipython: 2.3.1 -> 3.1.0	2015-05-02 22:05:07 +02:00
stdenv	Merge pull request #7740 from dezgeg/arm	2015-05-07 20:53:07 +02:00
test
tools	Updating cjdns to latest master.	2015-05-09 20:22:58 +00:00
top-level	Added jellyfish python package.	2015-05-10 13:46:00 +02:00