Vincent Laporte 7d3706c788 Merge remote-tracking branch 'upstream/master' into ocaml-sqlite3EZ ... Conflicts: pkgs/top-level/all-packages.nix		2014-09-02 13:32:43 +02:00
..
applications	Update pari	2014-09-02 14:25:17 +04:00
build-support	More support for SF.net in auto-updater	2014-09-02 14:25:16 +04:00
data	miscfiles: update from 1.4.2 to 1.5 and adopt it	2014-09-01 23:59:07 +02:00
desktops	Merge branch 'gnome3'	2014-09-02 12:59:47 +02:00
development	Merge remote-tracking branch 'upstream/master' into ocaml-sqlite3EZ	2014-09-02 13:32:43 +02:00
games	hawkthorne: Initial commit, license issue still unresolved	2014-08-31 20:08:15 +01:00
misc	Add auto-updater for XScreensaver	2014-09-02 14:25:17 +04:00
os-specific	Don't specify Perl version	2014-09-02 03:04:17 +04:00
servers	Merge pull request #3704 from sfultong/upstream-master	2014-09-02 02:09:18 +04:00
shells	pythonPackges.ipython: 2.0.0 -> 2.2.0	2014-08-25 11:01:31 +02:00
stdenv
test
tools	Update XDaliClock	2014-09-02 14:25:17 +04:00
top-level	Merge remote-tracking branch 'upstream/master' into ocaml-sqlite3EZ	2014-09-02 13:32:43 +02:00