Jude Taylor 6367e48225 Revert "pop" ... This reverts commit 724e243159. This (clearly) should never have been committed, and is probably due to a failed stash pop on my part.		2015-09-28 09:41:02 -07:00
..
applications	metis-prover: init at 2.3	2015-09-25 10:48:39 +02:00
build-support	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00
data	Merge: xlibs and x11 attribute cleanup	2015-09-23 10:42:34 +02:00
desktops	Merge branch 'gnome' into staging	2015-09-25 10:51:50 +02:00
development	Revert "pop"	2015-09-28 09:41:02 -07:00
games	dfhack: init at 0.40.24-r3	2015-09-23 23:52:03 +02:00
misc	lilypond: fix with new dblatex+texlive, fix meta	2015-09-23 21:14:16 +02:00
os-specific	libcap-ng: 0.7.3 -> 0.7.7	2015-09-23 20:49:19 -07:00
servers	Merge pull request #10028 from itkovian/elasticsearch-1.7.2	2015-09-25 11:10:10 +02:00
shells	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
stdenv	Revert "pop"	2015-09-28 09:41:02 -07:00
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-09-23 14:44:21 -07:00
top-level	excise accidental change included with 14bd5c0	2015-09-28 09:36:15 -07:00