Mateusz Kowalczyk 8185b6bba3 Merge pull request #4712 from schristo/phpstorm ... IDEA Editor: Adds PHPStorm support		2014-10-30 13:03:15 +00:00
..
applications	Merge pull request #4712 from schristo/phpstorm	2014-10-30 13:03:15 +00:00
build-support	Merge remote-tracking branch 'refs/remotes/origin/master' into chicken-eggs	2014-10-27 01:14:13 +01:00
data	Merge pull request #4674 from balajisivaraman/meslo-lg	2014-10-29 16:34:25 +00:00
desktops	Upgraded termite to v8, and its dependency vte to v0.38.0	2014-10-29 12:32:29 +01:00
development	Merge pull request #4722 from bosu/check-pure-cdb	2014-10-30 12:12:04 +01:00
games	Add odamex, a client/server multiplayer doom port	2014-10-29 05:05:44 -07:00
misc	oxygen-gtk2: update from 1.4.5 to 1.4.6	2014-10-28 21:43:19 +01:00
os-specific	grsecurity: Update stable and test patches	2014-10-30 12:47:36 +01:00
servers	Merge pull request #4724 from flosse/prosody-update	2014-10-29 21:51:07 +01:00
shells	zsh: update from 5.0.6 to 5.0.7	2014-10-09 09:43:33 +02:00
stdenv	Eliminate some optionals/optionalAttrs calls on the hot path	2014-10-05 01:59:24 +02:00
test	s/dependancy/dependency/	2014-09-10 00:28:49 +01:00
tools	Updated nox	2014-10-30 14:01:32 +01:00
top-level	Merge pull request #4722 from bosu/check-pure-cdb	2014-10-30 12:12:04 +01:00