Yury G. Kudryashov
f1362ffb93
Another merge miss
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=28795
2011-08-24 20:22:23 +00:00
Shea Levy
4d70ba6cc9
Merge from trunk up through r28790
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Yury G. Kudryashov
fdd58b2de4
rekonq-0.7.0, remove unused source.nix
...
svn path=/nixpkgs/trunk/; revision=28602
2011-08-15 23:39:05 +00:00
Lluís Batlle i Rossell
6dc839d344
Merging from trunk. I resolved some conflicts; I hope that well.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Yury G. Kudryashov
1c95704fa1
rekonq-0.6.1
...
svn path=/nixpkgs/trunk/; revision=24230
2010-10-12 05:41:13 +00:00
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
