Vladimír Čunát 4c5a71f777 Merge master into x-updates ...

Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix

2013-12-18 23:21:29 +01:00

..

arduino

ino: update to 0.3.6

2013-11-26 23:55:31 +01:00

compilers

Merge master into x-updates

2013-12-18 23:21:29 +01:00

eclipse

…

guile-modules

guile_lib: update from 0.2.1 to 0.2.2

2013-12-16 01:36:18 +02:00

interpreters

Merge master into x-updates

2013-12-18 23:21:29 +01:00

libraries

Merge master into x-updates

2013-12-18 23:21:29 +01:00

lisp-modules

lispPackages: Fix Github URIs.

2013-12-12 14:11:24 +01:00

misc

…

mobile

Revert android build tools update

2013-12-02 21:41:40 -05:00

ocaml-modules

added OCaml package ocamlsdl

2013-12-05 16:20:32 +01:00

perl-modules

BerkeleyDB: update to 0.54

2013-12-15 00:27:22 +04:00

python-modules

Merge master into x-updates

2013-12-18 23:21:29 +01:00

qtcreator

…

r-modules/generic

…

ruby-modules

…

tools

findbugs: update from 1.3.2 to 2.0.3

2013-12-18 18:18:27 +02:00

web

csslint: update from 0.5.0 to 0.10.0

2013-12-18 18:18:23 +02:00