Peter Simons 1d7f7ad92f Merge pull request #2353 from jwiegley/sage ... Add expression for sage		2014-04-28 22:46:27 +02:00
..
applications	Merge pull request #2353 from jwiegley/sage	2014-04-28 22:46:27 +02:00
build-support	debian: Update to 6.0.9	2014-04-25 10:43:26 +02:00
data	Merge pull request #1928 from 'cross-win-osx'.	2014-04-21 10:00:35 +02:00
desktops	Add some packages to the channel	2014-04-28 18:34:23 +02:00
development	Merge pull request #2368 from Chaddai/texmaker	2014-04-28 22:42:47 +02:00
games	tibia: version 10.38	2014-04-26 12:58:25 -05:00
misc	vim-plugins: update and upgrade	2014-04-21 19:21:18 +02:00
os-specific	psmisc: (from upstream) Typo in fuser makes -M on all the time	2014-04-27 20:19:31 +02:00
servers	Merge branch 'x-updates': mesa 10.0.* -> 10.1.1	2014-04-28 16:22:55 +02:00
shells	ipython: update 1.1.0 -> 2.0.0	2014-04-13 21:55:27 +02:00
stdenv	Typo/comment	2014-04-22 18:42:44 +02:00
test
tools	nixpkgs: remove cb1cat	2014-04-27 13:51:56 -05:00
top-level	Merge pull request #2353 from jwiegley/sage	2014-04-28 22:46:27 +02:00