diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-23 00:22:25 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-23 00:22:25 +0200 |
| commit | 0f99c7511410649264882a57e13c154b3d3c8568 (patch) | |
| tree | 32e779214367ccf4cf9aca84057bee6cf467264e /src/cookiejar.h | |
| parent | Merge branch 'StartRekonq' (diff) | |
| parent | dynamic space between previews (diff) | |
| download | rekonq-0f99c7511410649264882a57e13c154b3d3c8568.tar.xz | |
Fixing merge..
Merge commit 'refs/merge-requests/1889' of git://gitorious.org/rekonq/mainline into Fri9
Conflicts:
data/home.html
Diffstat (limited to 'src/cookiejar.h')
0 files changed, 0 insertions, 0 deletions