Thomas Tuegel f094da5e0d Revert "melpa-packages.json: remove "2048-game" to mitigate the effects of https://github.com/NixOS/nixpkgs/issues/12353" ... This reverts commit 625fe8164f.		2016-01-13 11:02:21 -06:00
..
applications	Revert "melpa-packages.json: remove "2048-game" to mitigate the effects of https://github.com/NixOS/nixpkgs/issues/12353"	2016-01-13 11:02:21 -06:00
build-support	Merge pull request #12062 from mogorman/platformio	2016-01-13 15:47:25 +01:00
data	zeal: 0.1.1 -> 0.2.1	2016-01-13 15:06:42 +11:00
desktops	gnome3_18: Update to latest patch release	2016-01-13 15:14:08 +01:00
development	Merge pull request #12062 from mogorman/platformio	2016-01-13 15:47:25 +01:00
games	lgogdownloader: 2.24 -> 2.26	2016-01-10 06:01:39 +03:00
misc	phantomjs2: build on darwin	2016-01-12 21:52:49 -08:00
os-specific	Merge pull request #12360 from kragniz/powertop-v2.8	2016-01-13 14:18:52 +01:00
servers	Merge pull request #12293 from abbradar/postfix-updates	2016-01-13 14:12:50 +01:00
shells	fish: fix merge conflict	2016-01-05 23:32:29 +01:00
stdenv	stdenv-darwin: allow easier testing of bootstrap tools	2016-01-03 21:47:09 -05:00
test
tools	Merge pull request #12266 from zimbatm/pngcrush-1.7.92	2016-01-13 14:48:36 +01:00
top-level	Remove previous CryptX version	2016-01-13 17:36:28 +01:00