Domen Kožar b1a8ae2a35 ffmpeg: fix bad merge		2016-03-27 13:31:04 +01:00
..
applications	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
build-support	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
data	mplus: Don't start version with a letter	2016-03-24 13:24:29 +01:00
desktops	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
development	ffmpeg: fix bad merge	2016-03-27 13:31:04 +01:00
games	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
misc	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
os-specific	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
servers	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
shells	oh-my-zsh: 2016-03-19 -> 2016-03-24	2016-03-25 15:07:06 -04:00
stdenv	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
test	Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.	2016-03-13 18:25:52 +00:00
tools	texlive: document in nixpkgs manual	2016-03-27 14:29:18 +02:00
top-level	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00