- Committer: l10n daemon script
- Date: 2016-08-09 10:07:49 UTC
- Revision ID: git-v1:6b893551bacd97c91d996266dc91e90edb74c6d1
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 | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
choqok
|
324 | 14 years ago | Mehrdad Momeny | Two new parts added to src, ( and a long way to ma |
|
||
|
cmake
|
697 | 14 years ago | Pino Toscano | add and use a proper cmake QJson search module (se |
|
||
|
doc
|
1096 | 13 years ago | Mehrdad Momeny | doc dir added (needs update) |
|
||
|
helperlibs
|
378 | 14 years ago | Mehrdad Momeny | A new part added to src for HelperLibs and a lib a |
|
||
|
icons
|
1 | 15 years ago | Mehrdad Momeny | Importing choqoK to repository svn path=/trunk/pl |
|
||
|
images
|
577 | 14 years ago | Mehrdad Momeny | Splash image added svn path=/trunk/extragear/netw |
|
||
|
libchoqok
|
350 | 14 years ago | Mehrdad Momeny | New works on Choqok moved here, from Git svn path |
|
||
|
microblogs
|
350 | 14 years ago | Mehrdad Momeny | New works on Choqok moved here, from Git svn path |
|
||
|
plugins
|
350 | 14 years ago | Mehrdad Momeny | New works on Choqok moved here, from Git svn path |
|
||
.gitignore |
1523 | 9 years ago | Andrea Scarpino | Ignore QtCreator files | 32 bytes |
|
|
|
.reviewboardrc |
1445 | 9 years ago | Andrea Scarpino | Add .reviewboardrc file | 97 bytes |
|
|
|
AUTHORS |
1494.1.93 | 9 years ago | Andrea Scarpino | Add myself to authors | 110 bytes |
|
|
|
changelog |
1662 | 7 years ago | Andrea Scarpino | Release 1.6 Beta2 | 14 KB |
|
|
|
CMakeLists.txt |
1657 | 7 years ago | Michael Palimaka | Remove unused Qt5Concurrent dependency. | 1.6 KB |
|
|
|
COPYING |
465 | 14 years ago | Mehrdad Momeny | COPYING file updated to have GPL2,3 + notice About | 796 bytes |
|
|
Messages.sh |
301 | 14 years ago | Jonathan Riddell | add missing Messages.sh file for translations svn | 197 bytes |
|
|
|
README |
1494.1.79 | 9 years ago | Andrea Scarpino | Update README | 758 bytes |
|
|
|
TODO |
428 | 14 years ago | Mehrdad Momeny | README and TODO files are updated. Prepending @USE | 176 bytes |
|
|