- Committer: l10n daemon script
- Date: 2018-12-29 11:21:14 UTC
- Revision ID: git-v1:ff206e0867834a2df703c5b2ce57efd9fdf85b90
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
cmake
|
2060 | 11 years ago | Andrea Diamantini | Let Opera sync handler being optional |
|
||
|
doc
|
1826 | 12 years ago | Andrea Diamantini | build system fixes - docs --> doc (as every other |
|
||
|
git_hooks
|
1677 | 12 years ago | Andrea Diamantini | Merge branch 'HOOKS' |
|
||
|
icons
|
3 | 14 years ago | adjam | Importing recode (rekonq code). I'm sorry I coudn' |
|
||
|
scripts
|
3 | 14 years ago | adjam | Importing recode (rekonq code). I'm sorry I coudn' |
|
||
|
src
|
3 | 14 years ago | adjam | Importing recode (rekonq code). I'm sorry I coudn' |
|
||
.gitignore |
1518 | 13 years ago | Andrea Diamantini | gdb history support | 135 bytes |
|
|
|
AUTHORS |
1910 | 12 years ago | Andrea Diamantini | Authors update | 127 bytes |
|
|
|
ChangeLog |
2318 | 11 years ago | Andrea Diamantini | Update changelog | 4.7 KB |
|
|
|
CMakeLists.txt |
2600 | 8 years ago | David Faure | the cmake min req version must be the very first t | 6.9 KB |
|
|
|
commit-template |
1679 | 12 years ago | Andrea Diamantini | Add rekonq commit-template To help people creatin | 1 KB |
|
|
|
config-kactivities.h.cmake |
2440 | 11 years ago | Andrea Diamantini | Support Activities Open links in new tab only if | 30 bytes |
|
|
|
config-qca2.h.cmake |
2060 | 11 years ago | Andrea Diamantini | Let Opera sync handler being optional | 23 bytes |
|
|
|
config-qtoauth.h.cmake |
2060 | 11 years ago | Andrea Diamantini | Let Opera sync handler being optional | 26 bytes |
|
|
|
config-version.h.cmake |
2060 | 11 years ago | Andrea Diamantini | Let Opera sync handler being optional | 44 bytes |
|
|
|
COPYING |
3 | 14 years ago | adjam | Importing recode (rekonq code). I'm sorry I coudn' | 34.3 KB |
|
|
|
COPYING.DOC |
1638 | 12 years ago | Rohan Garg | Add GFDL-1.2 licensing for docs | 19.9 KB |
|
|
|
CTestConfig.cmake |
1395 | 13 years ago | Andrea Diamantini | Added CtestConfig.cmake With this we can pull our | 529 bytes |
|
|
|
INSTALL |
2520 | 10 years ago | Andrea Diamantini | Upgrade INSTALL file (QtWebKit note) | 1.9 KB |
|
|
|
TODO |
518 | 14 years ago | Andrea Diamantini | updated TODO | 98 bytes |
|
|