lp:print-manager

Created by Deprecated Projected Neon on 2012-02-27 and last modified on 2016-12-05
Get this branch:
bzr branch lp:print-manager

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Deprecated Projected Neon
Project:
print-manager
Status:
Development

Import details

Import Status: Reviewed

This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/print-manager.

The next import is scheduled to run in 5 hours.

Last successful import was 1 minute ago.

Import started 2 minutes ago on pear and finished 1 minute ago taking 25 seconds — see the log
Import started 6 hours ago on pear and finished 6 hours ago taking 25 seconds — see the log
Import started 12 hours ago on pear and finished 12 hours ago taking 20 seconds — see the log
Import started 18 hours ago on pear and finished 18 hours ago taking 25 seconds — see the log
Import started on 2016-12-06 on pear and finished on 2016-12-06 taking 25 seconds — see the log
Import started on 2016-12-06 on pear and finished on 2016-12-06 taking 20 seconds — see the log
Import started on 2016-12-06 on pear and finished on 2016-12-06 taking 25 seconds — see the log
Import started on 2016-12-05 on pear and finished on 2016-12-05 taking 20 seconds — see the log
Import started on 2016-12-05 on pear and finished on 2016-12-05 taking 20 seconds — see the log
Import started on 2016-12-05 on pear and finished on 2016-12-05 taking 25 seconds — see the log

Recent revisions

595. By l10n daemon script <email address hidden> on 2016-12-05

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"

594. By l10n daemon script <email address hidden> on 2016-10-24

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"

593. By Rex Dieter <email address hidden> on 2016-09-12

fix FTBFS against cups-2.2

cupsGetPPD2 moved to cups/ppd.h

BUG: 366483
FIXED-IN: 16.08.2

592. By l10n daemon script <email address hidden> on 2016-06-25

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"

591. By David Faure on 2016-06-19

add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + fix compilation

590. By l10n daemon script <email address hidden> on 2016-06-12

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"

589. By Michael Pyne <email address hidden> on 2016-05-05

Avoid using uninitialized tempfile buffer.

If the PPD filename were null then we wouldn't fill in the tempfile
buffer and since we don't bail out early we'd later try to unlink
whatever file might be named by bytes in that buffer. Caught by
Coverity, CID 1335203

Also, the filename checks should use QString::isEmpty instead of
QString::isNull, given the logic of the relevant checks.

588. By l10n daemon script <email address hidden> on 2016-04-30

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"

587. By Heiko Becker on 2016-04-21

Silence CMake policy CMP0063 warning

...by adding the NO_POLICY_SCOPE flag as recommended by ECM's
documentation.

586. By l10n daemon script <email address hidden> on 2016-02-14

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"

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.