zimbatm 4ecb1ce679 Merge pull request #11274 from robgssp/ldap ... ldap-client: don't break on test failures		2016-02-26 23:13:27 +00:00
..
applications	Merge pull request #13486 from zimbatm/vim-default-config	2016-02-27 01:09:52 +03:00
build-support	Merge remote-tracking branch 'upstream/staging'	2016-02-26 22:37:04 +00:00
data	geolite-legacy 2016-02-08 -> 2016-02-25	2016-02-25 20:54:39 +01:00
desktops	Merge remote-tracking branch 'upstream/staging'	2016-02-26 22:37:04 +00:00
development	Merge pull request #11274 from robgssp/ldap	2016-02-26 23:13:27 +00:00
games	hedgewars: 0.9.21 -> 0.9.22, fix build failure	2016-02-24 14:29:35 +01:00
misc	Merge pull request #13479 from hrdinka/add/pcsx2	2016-02-26 23:56:55 +03:00
os-specific	Merge remote-tracking branch 'upstream/staging'	2016-02-26 22:37:04 +00:00
servers	Merge pull request #13125 from abbradar/uwsgi	2016-02-23 22:32:54 +00:00
shells	buildPythonApplication: use new function for Python applications	2016-02-19 13:16:41 +01:00
stdenv	stdenv: set SSL_CERT_FILE only if it isn't already	2016-02-25 13:53:29 +03:00
test
tools	Merge pull request #11210 from mitchty/munge-on-osx	2016-02-26 23:10:53 +00:00
top-level	Merge remote-tracking branch 'upstream/staging'	2016-02-26 22:37:04 +00:00