Yury G. Kudryashov 2bca92e32d Merge trunk ... Conflicts: 1. cmake upgrade: use 2.8.7 2. openssl: left FreeBSD-asm patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=31245		2012-01-03 17:25:24 +00:00
..
audio	Fix most packages depending on fltk	2012-01-03 10:32:56 +00:00
display-managers/slim	* slim: update to 1.3.2.	2011-02-14 10:15:48 +00:00
editors	Merge trunk	2012-01-02 14:12:40 +00:00
graphics	Fix most packages depending on fltk	2012-01-03 10:32:56 +00:00
misc	ikiwiki: updated to version 3.20111229	2012-01-02 14:51:20 +00:00
networking	Merge trunk	2012-01-03 17:25:24 +00:00
office	* GnuCash updated to 2.4.8.	2011-12-06 18:44:05 +00:00
science	Merge trunk	2012-01-03 17:25:24 +00:00
taxes	* Add Aangifte 2010.	2011-03-23 16:06:36 +00:00
version-management	git-annex: updated to version 3.20111231	2012-01-02 14:51:26 +00:00
video	added libdvbpsi and added it to the dependency list of vlc so that vlc can play DVB	2011-12-06 23:09:19 +00:00
virtualization	Bumped virtualbox version to 4.1.6	2011-11-30 14:44:29 +00:00
window-managers	adjusted awesome to generated names of xcbutil-*	2011-12-31 06:14:31 +00:00