Vladimír Čunát ffc2c539b4 pango: fix eval on darwin ... This was a cherry-pick silent conflict. The gettext is provided by libintlOrEmpty where needed.		2014-10-23 18:45:37 +02:00
..
applications	Merge recent master into staging	2014-10-23 17:40:41 +02:00
build-support	Merge recent master into staging	2014-10-23 17:40:41 +02:00
data	poppler_data: update from 0.4.6 to 0.4.7	2014-10-07 23:22:09 +02:00
desktops	Merge recent master into staging	2014-10-23 17:40:41 +02:00
development	pango: fix eval on darwin	2014-10-23 18:45:37 +02:00
games	update chocolateDoom to v2.1.0, chocolateDoomMaster removed	2014-10-22 00:01:33 -07:00
misc	vim-plugins: add and update	2014-10-21 15:42:35 +02:00
os-specific	Merge recent master into staging	2014-10-23 17:40:41 +02:00
servers	Merge recent master into staging	2014-10-23 17:40:41 +02:00
shells	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
stdenv	stdenv: Use "pipefail" in setup.sh	2014-10-10 14:02:15 +04:00
test
tools	Merge recent master into staging	2014-10-23 17:40:41 +02:00
top-level	Merge recent master into staging	2014-10-23 17:40:41 +02:00