Teo Mrnjavac
|
05790882f1
|
Rename PartitionManager things to KPMcore.
|
2015-07-02 14:19:33 +02:00 |
 Andrius Štikonas
|
46615725b5
|
Move FileSystem::defaultFileSystem to GUI.
|
2015-06-30 22:22:00 +03:00 |
|
Andrius Štikonas
|
80904cded3
|
Move Capacity::preferredUnit to GUI.
|
2015-06-14 02:01:19 +01:00 |
|
Andrius Štikonas
|
5c04c17cb7
|
Move createFileSystemColor back to GUI.
|
2015-06-12 15:06:48 +01:00 |
l10n daemon script
|
ce3faee105
|
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"
|
2015-06-12 10:26:58 +00:00 |
|
Andrius Štikonas
|
c37059f062
|
Stop installing partitionmanager.kcfg to avoid file collision.
|
2015-06-12 02:42:35 +01:00 |
|
Andrius Štikonas
|
13b1adac59
|
Remove unnecessary config.h includes.
|
2015-06-12 02:40:00 +01:00 |
|
l10n daemon script
|
c0b4df13ae
|
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"
|
2015-06-09 14:09:02 +00:00 |
|
l10n daemon script
|
fd7a7bd947
|
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"
|
2015-06-07 04:13:54 +00:00 |
|
l10n daemon script
|
55c21cf142
|
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"
|
2015-06-06 04:26:29 +00:00 |
|
l10n daemon script
|
80dc2e97b8
|
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"
|
2015-06-05 04:19:09 +00:00 |
|
Andrius Štikonas
|
1ef6fa8131
|
Move kpmcore library into its own repository.
|
2015-06-04 01:29:22 +01:00 |