Peter Simons 9e68734d61 Merge remote-tracking branch 'origin/master' into stdenv-updates.		2013-02-18 11:54:56 +01:00
..
admin	tigervnc: Drop dependency on libxcrypt	2013-01-28 17:19:03 +01:00
archivers	Merge remote-tracking branch 'origin/master' into stdenv-updates	2012-12-04 17:12:35 +01:00
backup	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-02-17 08:19:40 -05:00
bluetooth	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
cd-dvd
compression	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
filesystems	types.h -> types.patch	2013-01-28 17:27:14 +01:00
graphics	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-02-18 11:54:56 +01:00
inputmethods/fcitx	add fcitx-4.2.7	2013-01-28 11:35:03 +08:00
misc	file: bump from 5.11 to 5.12	2013-02-18 11:46:47 +01:00
networking	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-02-17 08:19:40 -05:00
package-management	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
security	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-02-18 11:54:56 +01:00
system	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
text	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
typesetting	texlive-moderncv: update to version 1.3.0	2013-02-11 21:15:17 +01:00
video	add swfmill-0.3.2	2013-02-05 11:36:18 +08:00
virtualization	ec2-ami-tools: Update to 1.4.0.9	2013-01-24 18:23:04 +01:00
X11	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-02-17 08:19:40 -05:00