Michael Raskin 3ad91106f1 Merge pull request #3704 from sfultong/upstream-master ... tomcat: update to upstream master		2014-09-02 02:09:18 +04:00
..
applications	Added support for minimal zim desktop wiki package.	2014-09-02 02:07:23 +04:00
build-support	Create wrapper directory outside of /bin/ for FHS chroots to be closer to FHS	2014-09-02 01:45:15 +04:00
data	miscfiles: update from 1.4.2 to 1.5 and adopt it	2014-09-01 23:59:07 +02:00
desktops	Make sure gnome-python has gnomevfs binding	2014-08-30 15:56:22 +02:00
development	Merge pull request #3681 from vbgl/merlin-1.7	2014-09-02 02:07:27 +04:00
games	hawkthorne: Initial commit, license issue still unresolved	2014-08-31 20:08:15 +01:00
misc	Remove unneeded definitions	2014-09-02 01:03:39 +04:00
os-specific	formatting/retab	2014-09-02 01:48:50 +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	urlwatch: add version 1.16	2014-09-02 01:29:30 +04:00
top-level	Merge pull request #3704 from sfultong/upstream-master	2014-09-02 02:09:18 +04:00