Eric Seidel 84e1c276e6 Merge pull request #7756 from ericbmerritt/fix-osx-crypto++ ... This resolves crypto++ build problems on OSX		2015-05-11 14:19:15 -07:00
..
applications	thunderbird: Update to 31.6.0	2015-05-11 11:46:57 +02:00
build-support	Merge branch 'master' into staging	2015-05-08 05:59:50 -07:00
data	man-pages 3.83 -> 4.00	2015-05-10 13:46:02 +02:00
desktops	kde4.kopete: fix build	2015-05-07 21:49:54 -05:00
development	Merge pull request #7756 from ericbmerritt/fix-osx-crypto++	2015-05-11 14:19:15 -07:00
games	Update LiquidWar	2015-05-10 13:46:31 +02:00
misc	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
os-specific	Merge branch 'master' into staging	2015-05-11 10:05:23 +02:00
servers	Merge pull request #7788 from Lassulus/charybdis	2015-05-11 12:57:58 +03:00
shells	pythonPackages.ipython: 2.3.1 -> 3.1.0	2015-05-02 22:05:07 +02:00
stdenv	Merge pull request #7740 from dezgeg/arm	2015-05-07 20:53:07 +02:00
test
tools	netsniff-ng -> 0.5.9	2015-05-11 23:12:09 +02:00
top-level	python-packages: SQLAlchemy: build	2015-05-11 23:12:09 +02:00