branches with status:
Name Status Last Modified Last Commit
lp:~neon/ktimer/master Development 2018-11-16 02:53:25 UTC 6 hours ago
317. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:53:25 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kgpg/master Development 2018-11-16 02:53:20 UTC 6 hours ago
2386. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:53:20 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kdf/master Development 2018-11-16 02:53:12 UTC 6 hours ago
665. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:53:12 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/audiocd-kio/master Development 2018-11-16 02:50:32 UTC 6 hours ago
841. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:50:32 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kolourpaint/master Development 2018-11-16 02:50:02 UTC 6 hours ago
2005. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:50:02 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kubrick/master Development 2018-11-16 02:49:40 UTC 6 hours ago
221. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:49:40 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/ksquares/master Development 2018-11-16 02:49:30 UTC 6 hours ago
405. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:49:30 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/knetwalk/master Development 2018-11-16 02:49:04 UTC 6 hours ago
539. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:49:04 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kmahjongg/master Development 2018-11-16 02:48:56 UTC 6 hours ago
1033. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:48:56 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kgoldrunner/master Development 2018-11-16 02:48:42 UTC 6 hours ago
920. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:48:42 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kdiamond/master Development 2018-11-16 02:48:34 UTC 6 hours ago
524. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:48:34 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kbounce/master Development 2018-11-16 02:48:26 UTC 6 hours ago
634. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:48:26 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kgeography/master Development 2018-11-16 02:47:23 UTC 6 hours ago
848. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:47:23 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kmag/master Development 2018-11-16 02:46:41 UTC 6 hours ago
537. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-16 02:46:41 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/parley/master Development 2018-11-15 19:30:29 UTC 13 hours ago
3282. Fix color bar painting failures in st...

Author: Hartmut Riesenbeck
Revision Date: 2018-11-15 19:30:29 UTC

Fix color bar painting failures in statistics main window

Summary:
Some color bars of the bar chart in LessonStatisticsView are not drawn
to its full length. The reason are rounding errors in bar segment length
calculation. To fix this, all integer values were replaced by floating
point variables.

Furthermore sometimes the border line between two bar segments was not
drawn when constructed with QPainterPath. The relevant QPainterPath
operation were replaced by direct drawing operations to the QPainter
object.

BUG: 389998

Reviewers: #kde_edu, tcanabrava

Reviewed By: #kde_edu, tcanabrava

Subscribers: kde-edu, tcanabrava

Tags: #kde_edu

Differential Revision: https://phabricator.kde.org/D10367

lp:~neon/project-neon/kscreen Development 2018-11-15 16:20:26 UTC 17 hours ago
519. Rename config loading function Summa...

Author: Roman Gilg
Revision Date: 2018-11-15 16:20:26 UTC

Rename config loading function

Summary: Make it more explicit what it does.

Test Plan: Serializer test passes.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D16859

lp:~neon/kturtle/master Development 2018-11-15 16:03:58 UTC 17 hours ago
904. Removed old-style casting warnings S...

Author: Mariana Suarez
Revision Date: 2018-11-15 16:03:58 UTC

Removed old-style casting warnings

Summary: To remove the 'old-style casting' warnings, replaced the old (type) cast to static_cast, dynamic_cast or reinterpret_cast

Reviewers: tcanabrava, rizzitello

Reviewed By: tcanabrava, rizzitello

Subscribers: apol, yurchor, kde-edu

Tags: #kde_edu

Differential Revision: https://phabricator.kde.org/D16863

lp:~neon/kajongg/master Development 2018-11-15 15:54:58 UTC 17 hours ago
3717. Fix minor typos

Author: Yuri Chornoivan
Revision Date: 2018-11-15 15:54:58 UTC

Fix minor typos

lp:~neon/kfourinline/master Development 2018-11-15 04:54:50 UTC 2018-11-15
828. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-11-15 04:54:50 UTC

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"

lp:~neon/kbreakout/master Development 2018-11-15 02:53:43 UTC 2018-11-15
583. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-15 02:53:43 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kcachegrind/master Development 2018-11-14 03:00:41 UTC 2018-11-14
906. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 03:00:41 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/marble/master Development 2018-11-14 02:56:13 UTC 2018-11-14
12088. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:56:13 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/klettres/master Development 2018-11-14 02:55:40 UTC 2018-11-14
782. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:55:40 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kiten/master Development 2018-11-14 02:55:36 UTC 2018-11-14
872. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:55:36 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kig/master Development 2018-11-14 02:55:30 UTC 2018-11-14
2454. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:55:30 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/khangman/master Development 2018-11-14 02:55:25 UTC 2018-11-14
1358. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:55:25 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kbruch/master Development 2018-11-14 02:55:03 UTC 2018-11-14
675. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:55:03 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kanagram/master Development 2018-11-14 02:54:58 UTC 2018-11-14
1109. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:54:58 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kalzium/master Development 2018-11-14 02:54:53 UTC 2018-11-14
3373. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:54:53 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kalgebra/master Development 2018-11-14 02:54:47 UTC 2018-11-14
1731. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:54:47 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/blinken/master Development 2018-11-14 02:54:34 UTC 2018-11-14
479. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:54:34 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/artikulate/master Development 2018-11-14 02:54:29 UTC 2018-11-14
699. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-14 02:54:29 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kdnssd/master Development 2018-11-13 09:16:45 UTC 2018-11-13
195. fix for macOS Reviewers: arichardson...

Author: Hessel van der Molen
Revision Date: 2018-11-13 09:16:45 UTC

fix for macOS

Reviewers: arichardson

Reviewed By: arichardson

Subscribers: bcooksley, arichardson, yurikoles, kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D15479

lp:~neon/ksudoku/master Development 2018-11-13 03:01:37 UTC 2018-11-13
783. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-13 03:01:37 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/ksirk/master Development 2018-11-13 03:01:26 UTC 2018-11-13
700. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-13 03:01:26 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kreversi/master Development 2018-11-13 03:01:17 UTC 2018-11-13
964. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-13 03:01:17 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/kolf/master Development 2018-11-13 03:01:05 UTC 2018-11-13
1209. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-13 03:01:05 UTC

GIT_SILENT made messages (after extraction)

lp:~neon/klickety/master Development 2018-11-13 03:00:38 UTC 2018-11-13
459. GIT_SILENT made messages (after extra...

Author: l10n daemon script
Revision Date: 2018-11-13 03:00:38 UTC

GIT_SILENT made messages (after extraction)

lp:konsole Development 2018-11-13 02:02:59 UTC 2018-11-13
6253. set variable in initialize list and e...

Author: Kurt Hindenburg
Revision Date: 2018-11-13 02:02:59 UTC

set variable in initialize list and explictly use bool in if

lp:~neon/project-neon/share-like-connect Development 2018-11-13 01:11:45 UTC 2018-11-13
298. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-11-13 01:11:45 UTC

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"

lp:~neon/kmplot/master Development 2018-11-12 19:37:36 UTC 2018-11-12
1278. i18n: avoid word puzzles

Author: Yuri Chornoivan
Revision Date: 2018-11-12 19:37:36 UTC

i18n: avoid word puzzles

lp:~neon/lskat/master Development 2018-11-12 18:49:02 UTC 2018-11-12
619. Fix minor typos and EBN issue

Author: Yuri Chornoivan
Revision Date: 2018-11-12 18:49:02 UTC

Fix minor typos and EBN issue

lp:~neon/kcolorchooser/master Development 2018-11-12 15:59:14 UTC 2018-11-12
110. Increase version

Author: Montel Laurent
Revision Date: 2018-11-12 15:59:14 UTC

Increase version

lp:~neon/extra-cmake-modules/master Development 2018-11-12 10:21:07 UTC 2018-11-12
868. Use `MATCHES "Clang"` to detect clang...

Author: RJVB
Revision Date: 2018-11-12 10:21:07 UTC

Use `MATCHES "Clang"` to detect clang

This is for compatibility with Apple's Xcode
compilers which identify as AppleClang.

Differential Revision: https://phabricator.kde.org/D16816

lp:~neon/kfloppy/master Development 2018-11-12 08:22:36 UTC 2018-11-12
622. Autogenerate logging categories + use...

Author: Montel Laurent
Revision Date: 2018-11-12 08:22:36 UTC

Autogenerate logging categories + use new categories file syntax

lp:~neon/libksane/master Development 2018-11-11 16:32:40 UTC 2018-11-11
429. Export startPreviewScan slot A new s...

Author: truf
Revision Date: 2018-11-11 16:32:40 UTC

Export startPreviewScan slot

A new slot is moved to public in KSaneWidget to let user launch scan preview.
Intended to be used via SkanLite which supports D-Bus global hotkeys.

Differential Revision: https://phabricator.kde.org/D16795

lp:~neon/kapman/master Development 2018-11-10 22:21:22 UTC 2018-11-10
472. Hide intro label if it's there when s...

Author: Albert Astals Cid
Revision Date: 2018-11-10 22:21:22 UTC

Hide intro label if it's there when starting a new level

BUGS: 320285

lp:~neon/project-neon/prison Development 2018-11-10 08:59:27 UTC 2018-11-10
154. GIT_SILENT Upgrade KF5 version to 5.5...

Author: l10n daemon script
Revision Date: 2018-11-10 08:59:27 UTC

GIT_SILENT Upgrade KF5 version to 5.53.0.

lp:~neon/kactivities/master Development 2018-11-10 08:53:57 UTC 2018-11-10
953. GIT_SILENT Upgrade KF5 version to 5.5...

Author: l10n daemon script
Revision Date: 2018-11-10 08:53:57 UTC

GIT_SILENT Upgrade KF5 version to 5.53.0.

lp:~neon/project-neon/attica Development 2018-11-10 08:53:27 UTC 2018-11-10
662. GIT_SILENT Upgrade KF5 version to 5.5...

Author: l10n daemon script
Revision Date: 2018-11-10 08:53:27 UTC

GIT_SILENT Upgrade KF5 version to 5.53.0.

lp:~neon/bomber/master Development 2018-11-10 07:42:21 UTC 2018-11-10
384. GIT_SILENT Upgrade KDE Applications v...

Author: Albert Astals Cid
Revision Date: 2018-11-10 07:42:21 UTC

GIT_SILENT Upgrade KDE Applications version to 19.03.70.

lp:~neon/dragon/master Development 2018-11-10 07:41:38 UTC 2018-11-10
748. GIT_SILENT Upgrade KDE Applications v...

Author: Albert Astals Cid
Revision Date: 2018-11-10 07:41:38 UTC

GIT_SILENT Upgrade KDE Applications version to 19.03.70.

lp:~neon/filelight/master Development 2018-11-10 07:40:29 UTC 2018-11-10
674. GIT_SILENT Upgrade KDE Applications v...

Author: Albert Astals Cid
Revision Date: 2018-11-10 07:40:29 UTC

GIT_SILENT Upgrade KDE Applications version to 19.03.70.

lp:~neon/kamera/master Development 2018-11-10 07:39:27 UTC 2018-11-10
500. GIT_SILENT Upgrade KDE Applications v...

Author: Albert Astals Cid
Revision Date: 2018-11-10 07:39:27 UTC

GIT_SILENT Upgrade KDE Applications version to 19.03.70.

lp:~neon/kmouth/master Development 2018-11-09 12:58:44 UTC 2018-11-09
568. Port to new connect api

Author: Laurent Montel
Revision Date: 2018-11-09 12:58:44 UTC

Port to new connect api

lp:~neon/granatier/master Development 2018-11-09 07:54:55 UTC 2018-11-09
797. Port to new connect api

Author: Laurent Montel
Revision Date: 2018-11-09 07:54:55 UTC

Port to new connect api

lp:~neon/ktuberling/master Development 2018-11-08 00:10:42 UTC 2018-11-08
866. Refine donation url in appdata

Author: Albert Astals Cid
Revision Date: 2018-11-08 00:10:42 UTC

Refine donation url in appdata

lp:~neon/kmines/master Development 2018-11-08 00:09:30 UTC 2018-11-08
1122. Refine donation url in appdata

Author: Albert Astals Cid
Revision Date: 2018-11-08 00:09:30 UTC

Refine donation url in appdata

lp:~neon/klines/master Development 2018-11-08 00:07:42 UTC 2018-11-08
623. Refine donation url in appdata

Author: Albert Astals Cid
Revision Date: 2018-11-08 00:07:42 UTC

Refine donation url in appdata

lp:~neon/kmousetool/master Development 2018-11-08 00:04:08 UTC 2018-11-08
307. Refine donation url in appdata

Author: Albert Astals Cid
Revision Date: 2018-11-08 00:04:08 UTC

Refine donation url in appdata

lp:~neon/kcharselect/master Development 2018-11-08 00:01:22 UTC 2018-11-08
345. Refine donation url in appdata

Author: Albert Astals Cid
Revision Date: 2018-11-08 00:01:22 UTC

Refine donation url in appdata

lp:~neon/kruler/master Development 2018-11-07 23:59:05 UTC 2018-11-07
566. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:59:05 UTC

Add donation url to appdata

lp:~neon/lokalize/master Development 2018-11-07 23:54:11 UTC 2018-11-07
1311. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:54:11 UTC

Add donation url to appdata

lp:~neon/kompare/master Development 2018-11-07 23:53:55 UTC 2018-11-07
958. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:53:55 UTC

Add donation url to appdata

lp:~neon/picmi/master Development 2018-11-07 23:52:57 UTC 2018-11-07
451. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:52:57 UTC

Add donation url to appdata

lp:~neon/kspaceduel/master Development 2018-11-07 23:51:13 UTC 2018-11-07
512. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:51:13 UTC

Add donation url to appdata

lp:~neon/kshisen/master Development 2018-11-07 23:50:16 UTC 2018-11-07
1073. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:50:16 UTC

Add donation url to appdata

lp:~neon/kollision/master Development 2018-11-07 23:48:23 UTC 2018-11-07
397. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:48:23 UTC

Add donation url to appdata

lp:~neon/knavalbattle/master Development 2018-11-07 23:47:24 UTC 2018-11-07
1179. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:47:24 UTC

Add donation url to appdata

lp:~neon/kblackbox/master Development 2018-11-07 23:38:09 UTC 2018-11-07
607. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:38:09 UTC

Add donation url to appdata

lp:~neon/kiriki/master Development 2018-11-07 23:36:38 UTC 2018-11-07
314. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:36:38 UTC

Add donation url to appdata

lp:~neon/katomic/master Development 2018-11-07 23:36:13 UTC 2018-11-07
771. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:36:13 UTC

Add donation url to appdata

lp:~neon/bovo/master Development 2018-11-07 23:34:40 UTC 2018-11-07
613. Add donation url to appdata

Author: Albert Astals Cid
Revision Date: 2018-11-07 23:34:40 UTC

Add donation url to appdata

lp:~neon/analitza/master Development 2018-11-07 05:49:37 UTC 2018-11-07
2027. remove qt include prefix

Author: Laurent Montel
Revision Date: 2018-11-07 05:49:37 UTC

remove qt include prefix

lp:~neon/libkdegames/master Development 2018-11-06 16:37:56 UTC 2018-11-06
1945. Fix minor API docs issues

Author: Yuri Chornoivan
Revision Date: 2018-11-06 16:37:56 UTC

Fix minor API docs issues

lp:~neon/kdegraphics-mobipocket/master Development 2018-11-06 12:26:51 UTC 2018-11-06
215. Remove Qt prefix

Author: Laurent Montel
Revision Date: 2018-11-06 12:26:51 UTC

Remove Qt prefix

lp:~neon/ffmpegthumbs/master Development 2018-11-03 15:25:54 UTC 2018-11-03
105. Merge branch 'Applications/18.08'

Author: Fabian Vogt
Revision Date: 2018-11-03 15:25:54 UTC

Merge branch 'Applications/18.08'

lp:~neon/kcron/master Development 2018-11-02 12:46:01 UTC 2018-11-02
638. Fix compile with strict compile flags...

Author: Laurent Montel
Revision Date: 2018-11-02 12:46:01 UTC

Fix compile with strict compile flags + aytotgenerate debug file +

install categories file

lp:~neon/project-neon/polkit-kde-agent-1 Development 2018-10-31 15:34:53 UTC 2018-10-31
346. Connect slots explicitly instead of u...

Author: Alexander Volkov
Revision Date: 2018-10-31 15:34:53 UTC

Connect slots explicitly instead of using auto-connections

Summary:
Auto-connections is bad practice cause object renames break code
and it can't be detected at compile time.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D16547

lp:~neon/kdesdk-thumbnailers/master Development 2018-10-27 18:56:02 UTC 2018-10-27
45. Port away from deprecated writeConfig()

Author: Yuri Chornoivan
Revision Date: 2018-10-27 18:56:02 UTC

Port away from deprecated writeConfig()

lp:~neon/project-neon/plasma-mediacenter Development 2018-10-27 08:50:08 UTC 2018-10-27
2011. Fix minor typos and EBN issues

Author: Yuri Chornoivan
Revision Date: 2018-10-27 08:50:08 UTC

Fix minor typos and EBN issues

lp:~neon/kdegraphics-thumbnailers/master Development 2018-10-19 09:34:44 UTC 2018-10-19
145. Avoid nullptr access When we get a b...

Author: 8p-k26-gj
Revision Date: 2018-10-19 09:34:44 UTC

Avoid nullptr access

When we get a bogus file bbox() may be null and accessing it will crash the thumbnailer.

CHANGELOG: Fixed crash when trying to generate a thumbnail for bogus .eps files

BUG: 399896
FIXED-IN: 18.08.3

Differential Revision: https://phabricator.kde.org/D16290

lp:~neon/project-neon/plasma-mobile Development 2018-10-16 04:00:30 UTC 2018-10-16
3124. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-10-16 04:00:30 UTC

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"

lp:~neon/libkomparediff2/master Development 2018-10-14 15:22:39 UTC 2018-10-14
298. Fix minor typos

Author: Yuri Chornoivan
Revision Date: 2018-10-14 15:22:39 UTC

Fix minor typos

lp:~neon/project-neon/libkscreen Development 2018-10-12 05:00:21 UTC 2018-10-12
907. Rename kscreen.categories to libkscre...

Author: Luca Beltrame
Revision Date: 2018-10-12 05:00:21 UTC

Rename kscreen.categories to libkscreen.categories

Otherwise it will conflict with the file with the same name in the
kscreen repository.

Issue found by the Open Build Service.

CCMAIL: montel@kde.org

lp:~neon/kde-dev-utils/master Development 2018-10-10 04:41:36 UTC 2018-10-10
418. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-10-10 04:41:36 UTC

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"

lp:~neon/kapptemplate/master Development 2018-10-10 04:41:26 UTC 2018-10-10
744. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-10-10 04:41:26 UTC

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"

lp:~neon/kdenetwork-filesharing/master Development 2018-10-10 04:38:30 UTC 2018-10-10
701. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-10-10 04:38:30 UTC

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"

lp:~neon/libkcddb/master Development 2018-10-10 04:38:08 UTC 2018-10-10
641. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-10-10 04:38:08 UTC

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"

lp:libkipi Development 2018-10-10 04:37:07 UTC 2018-10-10
1170. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-10-10 04:37:07 UTC

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"

lp:~neon/killbots/master Development 2018-10-10 04:33:37 UTC 2018-10-10
583. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-10-10 04:33:37 UTC

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"

lp:~neon/okteta/master Development 2018-10-10 04:22:30 UTC 2018-10-10
3282. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-10-10 04:22:30 UTC

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"

lp:~neon/phonon/vlc Development 2018-10-09 11:24:16 UTC 2018-10-09
644. Merge branch '0.10' # Conflicts: # s...

Author: Harald Sitter
Revision Date: 2018-10-09 11:24:16 UTC

Merge branch '0.10'

# Conflicts:
# src/vlc.desktop.cmake

lp:~neon/phonon/gstreamer Development 2018-10-07 00:11:40 UTC 2018-10-07
2636. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-10-07 00:11:40 UTC

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"

lp:~neon/libkexiv2/master Development 2018-09-25 14:59:20 UTC 2018-09-25
745. Initialize cmake project after cmake_...

Author: Hannah von Reth
Revision Date: 2018-09-25 14:59:20 UTC

Initialize cmake project after cmake_minimum_required was set

lp:~neon/svgpart/master Development 2018-09-21 19:22:16 UTC 2018-09-21
93. Use KDEFrameworkCompilerSettings

Author: Laurent Montel
Revision Date: 2018-09-21 19:22:16 UTC

Use KDEFrameworkCompilerSettings

lp:~neon/plasma-widget-networkmanagement/trunk Development 2018-09-17 00:10:37 UTC 2018-09-17
2538. SVN_SILENT made messages (.desktop fi...

Author: l10n daemon script
Revision Date: 2018-09-17 00:10:37 UTC

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"

lp:~neon/libkdcraw/master Development 2018-09-16 06:04:34 UTC 2018-09-16
1064. Fix minor typos

Author: Yuri Chornoivan
Revision Date: 2018-09-16 06:04:34 UTC

Fix minor typos

lp:libktorrent Development 2018-08-15 15:57:15 UTC 2018-08-15
367. Fix minor EBN issues and do not break...

Author: Yuri Chornoivan
Revision Date: 2018-08-15 15:57:15 UTC

Fix minor EBN issues and do not break the build

lp:~neon/kopete/master Development 2018-05-31 12:11:23 UTC 2018-05-31
13421. Merge branch 'Applications/18.04'

Author: Luca Beltrame
Revision Date: 2018-05-31 12:11:23 UTC

Merge branch 'Applications/18.04'

1100 of 525 results