Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
androidenv
flashtool
titaniumenv	Implemented wireless adhoc distribution support for titanium apps	2014-08-04 11:26:14 +02:00
xcodeenv	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
xpwn