Vladimír Čunát b5fba47147 Merge branch master into x-updates ...

Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix

2013-11-23 10:22:26 +01:00

..

applications

Merge branch master into x-updates

2013-11-23 10:22:26 +01:00

build-support

clang-wrapper: Optionally use libc++ instead of libstdc++.

2013-11-16 13:53:48 +01:00

data

shared_mime_info: update 1.1 -> 1.2

2013-11-18 20:13:18 +01:00

desktops

Merge branch master into x-updates

2013-11-23 10:22:26 +01:00

development

Merge branch master into x-updates

2013-11-23 10:22:26 +01:00

games

Merge pull request #1236 from lovek323/sdlmame

2013-11-22 23:24:35 -08:00

misc

wine: (stable) bugfix update 1.6 -> 1.6.1

2013-11-16 18:22:16 +01:00

os-specific

Merge branch master into x-updates

2013-11-23 10:22:26 +01:00

servers

Merge branch master into x-updates

2013-11-23 10:22:26 +01:00

shells

Merge pull request #1014 from coroa/scipy

2013-09-26 12:09:20 -07:00

stdenv

mkDerivation: Set meta.position to the source file of the derivation

2013-11-19 14:58:47 +01:00

test

…

tools

Merge branch master into x-updates

2013-11-23 10:22:26 +01:00

top-level

Merge branch master into x-updates

2013-11-23 10:22:26 +01:00