You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Montel Laurent
2e0fc4ccd3
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
CMakeLists.txt
agents/folderarchiveagent.desktop
console/kabcclient/doc/examples/letters/home_address.desktop
console/kabcclient/doc/examples/letters/work_address.desktop
examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop
kalarm/resources/kalarm_manager.desktop
kalarm/resources/local.desktop
kalarm/resources/localdir.desktop
kalarm/resources/remote.desktop
kjots/plasmoid/akonotes.desktop
kjots/plasmoid/akonotes_list.desktop
kjots/plasmoid/akonotes_note.desktop
kmail/dialog/addemailtoexistingcontactdialog.cpp
knode/KNode.desktop
knode/knode_config_accounts.desktop
knode/knode_config_appearance.desktop
knode/knode_config_cleanup.desktop
knode/knode_config_identity.desktop
knode/knode_config_post_news.desktop
knode/knode_config_privacy.desktop
knode/knode_config_read_news.desktop
kontact/plugins/knode/knode.setdlg
kontact/plugins/knode/knodeplugin.desktop
kontact/plugins/ktimetracker/ktimetracker.setdlg
kontact/plugins/ktimetracker/ktimetracker_plugin.desktop
kontact/plugins/planner/kcmplanner.desktop
kontact/plugins/planner/planner.setdlg
kontact/plugins/planner/plannerplugin.desktop
kresources/blog/blog.desktop
kresources/remote/remote.desktop
ktimetracker/ktimetracker_config_behavior.desktop
ktimetracker/ktimetracker_config_display.desktop
ktimetracker/ktimetracker_config_storage.desktop
ktimetracker/ktimetrackerpart.desktop
ktimetracker/support/ktimetracker.desktop
|
12 years ago |
| .. |
|
CMakeLists.txt
|
Fix i18n
|
12 years ago |
|
kcm_kpimidentities.cpp
|
autogenerate export header file
|
12 years ago |
|
kcm_kpimidentities.desktop
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
