lp://staging/~neon/kmix/master
- Get this branch:
- bzr branch lp://staging/~neon/kmix/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/kmix.
Last successful import was .
Recent revisions
- 1911. By Max Brazhnikov <email address hidden>
-
kmix assumes volume range 1:100 for oss mixer instead of 0:100.
Summary:
See https://bugs.kde. org/344468
and https://bugs.freebsd. org/bugzilla/ show_bug. cgi?id= 184996 Reviewers: #freebsd, marten, adridg, ltoscano
Reviewed By: #freebsd, adridg
Subscribers: adridg, ltoscano, rakuco
Differential Revision: https:/
/phabricator. kde.org/ D6925 - 1909. By l10n daemon script <email address hidden>
-
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" - 1907. By Mr. Anderson
-
Make kded happy by prepending "kded_" to the X-KDE-Library value "kmixd"
kded complains:
> found kded module "kmixd" by prepending 'kded_' to the library path, please fix your metadata.
Fix it by prepending kded_ in the corresponding file kmixd.desktop.
REVIEW: 127735
- 1906. By Heiko Becker
-
Silence CMake policy CMP0063 warning
...by adding the NO_POLICY_SCOPE flag as recommended by ECM's
documentation. - 1905. By Heiko Becker
-
CMakeLists.txt: Use cmake's automoc
This fixes a error with cmakes >= 2.8.12: 'The dependency target
"kmixctrl_automoc" of target "kmixctrl" does not exist...'I guess 48f6e64d98e4aaa
47f2a49faa5f3e8 21bc21fd6e in automoc.git would
also fix the error, but since kmix already depends on cmake 2.8.11,
which has the included automoc, a one-liner seems easier than
expecting people to backport commits for automoc.REVIEW: 127479
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)