Domen Kožar 3b381d37ee Merge pull request #5096 from aszlig/buildenv-check-collision-contents ... buildEnv: Check the content of colliding paths.		2016-01-19 01:00:09 +01:00
..
applications	elpaBuild: factor out package installation	2016-01-18 15:29:19 -06:00
build-support	Merge pull request #5096 from aszlig/buildenv-check-collision-contents	2016-01-19 01:00:09 +01:00
data	geolite-legacy 2016-01-11 -> 2016-01-18	2016-01-18 15:22:40 +01:00
desktops	vte: remove the forgotten patch	2016-01-18 16:03:56 +01:00
development	Merge pull request #12425 from DamienCassou/pharo-vm-no-conflict-v3	2016-01-18 20:40:30 +01:00
games	pioneer: nixpkg added	2016-01-18 19:03:35 +01:00
misc	vimPlugins.youcompleteme: patch default python path	2016-01-16 20:21:47 +01:00
os-specific	tarball: fix evaluation of mdadm on darwin	2016-01-18 15:05:38 +01:00
servers	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
shells	fish: fix merge conflict	2016-01-05 23:32:29 +01:00
stdenv	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
test
tools	snapper: use autoreconfHook	2016-01-18 19:32:48 +01:00
top-level	emacsPackagesNg: add note about elpaBuild	2016-01-18 15:29:18 -06:00