- Committer: l10n daemon script
- Date: 2017-05-24 01:28:58 UTC
- Revision ID: git-v1:a899f93d59f690bec55ec6d65c51e442566b94aa
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
|
1 | 16 years ago | Matthias Kretz | - copy non-KDE parts of kdelibs/phonon to kdesuppo |
|
||
|
gstreamer
|
20 | 15 years ago | Matthias Kretz | move non-KDE dependant Phonon backends to kdesuppo |
|
||
|
tools
|
2523 | 13 years ago | Trever Fischer | Merge branch 'master' of git.kde.org:phonon-gstrea |
|
||
.gitignore |
2591 | 10 years ago | Harald Sitter | ignore build5 | 19 bytes |
|
|
|
.mailmap |
2580 | 10 years ago | Torrie Fischer | Add .mailmap to coalesce my emails | 225 bytes |
|
|
|
.reviewboardrc |
2624 | 8 years ago | Harald Sitter | add reviewboardrc | 157 bytes |
|
|
|
CMakeLists.txt |
2630 | 8 years ago | Harald Sitter | bump version to 4.9.0 for release prep | 2.9 KB |
|
|
|
COPYING.LIB |
57 | 15 years ago | Jonathan Riddell | Standardise on LGPL 2.1, 3 or later as approved by | 25.9 KB |
|
|
|
Messages.sh |
2482 | 13 years ago | Harald Sitter | ok, so we already had a Messages.sh, though it was | 291 bytes |
|
|