Robin Gloster abdd8a81eb Merge pull request #12513 from nckx/master ... Update & fix Sphinx [PR for Travis testing]		2016-01-21 05:30:02 +01:00
..
applications	Merge pull request #12499 from wandernauta/clion-1.2.4	2016-01-20 22:37:39 +03:00
build-support	Merge pull request #10998 from andrewrynhard/master	2016-01-19 12:01:55 +01:00
data	geolite-legacy 2016-01-11 -> 2016-01-18	2016-01-18 15:22:40 +01:00
desktops	gnome3: 3.18.1 -> 3.18.2	2016-01-19 11:32:06 +01:00
development	Merge pull request #12513 from nckx/master	2016-01-21 05:30:02 +01:00
games	zeroad: fix 0ad.desktop after #12421	2016-01-20 11:28:13 +01:00
misc	vimPlugins.youcompleteme: enable on unix	2016-01-19 22:41:31 +01:00
os-specific	linux-4.2: remove as it's no longer maintained upstream	2016-01-20 20:15:07 +01:00
servers	Merge pull request #12497 from philandstuff/bump-ct-xjson-cluster-fix	2016-01-20 16:24:29 +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	brotli: init at 0.3.0	2016-01-20 22:50:26 +01:00
top-level	pythonPackages.sphinx_1_2: disable checks	2016-01-21 04:11:59 +01:00