Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates ...

Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.

2012-12-28 23:28:16 +01:00

..

addon.xml

- Updated android SDK to version 21

2012-12-20 14:04:52 +01:00

addons.nix

- Updated android SDK to version 21

2012-12-20 14:04:52 +01:00

androidsdk.nix

- Updated android SDK to version 21

2012-12-20 14:04:52 +01:00

build-app.nix

Remove unnecessary parentheses around if conditions

2012-12-28 19:54:15 +01:00

default.nix

- Updated android SDK to version 21

2012-12-20 14:04:52 +01:00

emulate-app.nix

Fix two wrong paths, due to path refactoring so that the emulation script works again

2012-11-08 16:30:36 +01:00

generate-addons.sh

…

generate-addons.xsl

…

generate-platforms.sh

…

generate-platforms.xsl

…

generate-sysimages.sh

…

generate-sysimages.xsl

…

platform-tools.nix

- Updated android SDK to version 21

2012-12-20 14:04:52 +01:00

platforms-linux.nix

- Updated android SDK to version 21

2012-12-20 14:04:52 +01:00

platforms-macosx.nix

- Updated android SDK to version 21

2012-12-20 14:04:52 +01:00

repository-7.xml

- Updated android SDK to version 21

2012-12-20 14:04:52 +01:00

support.nix

- Updated android SDK to version 21

2012-12-20 14:04:52 +01:00

sysimages.nix

- Updated android SDK to version 21

2012-12-20 14:04:52 +01:00