lethalman 92bbf0f76c Merge pull request #6412 from olavks/lua-cjson ... Add lua package for json module written in C		2015-02-26 10:01:58 +01:00
..
applications	Merge pull request #6443 from bstrik/master	2015-02-26 10:00:01 +01:00
build-support	nix-prefetch-git: print commit date (close #6522)	2015-02-24 23:02:59 +01:00
data	Merge branch 'kde5'	2015-02-25 15:09:44 -06:00
desktops	plasma52: update to 5.2.1	2015-02-24 20:22:45 -06:00
development	Adds ocaml-asn1-combinators	2015-02-26 08:35:05 +01:00
games	Update the sources to the latest version and added one new dependency	2015-02-25 00:25:14 -05:00
misc	Revert "vimPlugins: update" due to bad hashes	2015-02-24 21:59:41 +01:00
os-specific	linux-firmware-nonfree: Use date instead of git version	2015-02-25 11:53:14 -08:00
servers	Merge pull request #6518 from ehmry/u9fs	2015-02-26 09:41:18 +01:00
shells	Fish wants libiconv too, even though it won't admit it	2015-02-18 01:14:36 -05:00
stdenv	Fix building on Xcode	2015-02-24 17:07:44 +01:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge pull request #6482 from auntieNeo/nkf-master	2015-02-26 09:44:53 +01:00
top-level	Merge pull request #6412 from olavks/lua-cjson	2015-02-26 10:01:58 +01:00