Lluís Batlle i Rossell
5417c720fd
Merging from trunk.
...
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
Yury G. Kudryashov
45fd5a9836
Upgrade rekonq
...
svn path=/nixpkgs/trunk/; revision=22835
2010-07-31 13:06:10 +00:00
Lluís Batlle i Rossell
5a9be6d9d9
Merged from trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=21983
2010-05-26 07:06:02 +00:00
Yury G. Kudryashov
d737607b56
rekonq-0.4.90
...
svn path=/nixpkgs/trunk/; revision=21979
2010-05-26 05:57:55 +00:00
Yury G. Kudryashov
e69bf4f278
Remove unused lines
...
svn path=/nixpkgs/trunk/; revision=21780
2010-05-15 09:49:07 +00:00
Yury G. Kudryashov
52c65a1e62
Add rekonq browser (both 0.4.0 and latest git)
...
svn path=/nixpkgs/trunk/; revision=21779
2010-05-15 09:47:32 +00:00
