Austin Seipp 537dbfed78 Merge pull request #2898 from robberer/php/mssql ... mssql support for php-5.4		2014-06-18 16:25:24 -05:00
..
applications	Merge pull request #2977 from bluescreen303/emacs-org2blog	2014-06-18 16:21:02 -05:00
build-support	Add a function to overwrite just the version and sha256 by grepping them	2014-06-13 13:37:12 +04:00
data	aurulent-sans: new expression	2014-06-18 04:12:10 +04:00
desktops	e17.terminology: 0.4.0 -> 0.5.1	2014-06-15 09:26:01 +04:00
development	Merge pull request #2898 from robberer/php/mssql	2014-06-18 16:25:24 -05:00
games	Merge pull request #2937 from cpages/oxc	2014-06-18 16:16:07 -05:00
misc	Merge recent master	2014-06-15 17:55:35 +02:00
os-specific	Create an option to build 3.16-rc1 which carries a new Wireless driver; make USB_DEBUG optional as it seems to be planned to disappear in 3.16.	2014-06-18 00:23:48 +02:00
servers	Merge pull request #2976 from bluescreen303/nginx	2014-06-17 14:23:15 +02:00
shells
stdenv	Don't suggest using --arg config '{ allowUnfree = true; }'	2014-06-17 15:00:24 -05:00
test
tools	Merge pull request #3004 from offlinehacker/pkgs/logstash/update_1_3_3	2014-06-18 16:20:00 -05:00
top-level	Merge pull request #2992 from bluescreen303/agda	2014-06-18 16:22:33 -05:00