summary refs log tree commit diff
path: root/pkgs/misc/cups
Commit message (Expand)AuthorAge
...
* Merge branch 'master' into closure-sizeVladimír Čunát2016-04-01
|\
| * Merge pull request #14010 from yochai/masterjoachifm2016-03-18
| |\
| | * mfcj470dw: fix missing file errorYochai2016-03-18
| * | splix: revert of revert of "2.0.0 -> svn-r315 version update"Peter Simons2016-03-18
| |/
| * Merge pull request #7596 from jraygauthier/jrg/brother_mfc7860dwjoachifm2016-03-15
| |\
| | * brgenml1cupswrapper: init at 3.1.0-1Raymond Gauthier2016-03-14
* | | Merge master into closure-sizeVladimír Čunát2016-03-08
|\| |
| * | splix: revert "2.0.0 -> svn-r315" version updatePeter Simons2016-03-07
| |/
| * splix: cleanupzimbatm2016-02-27
| * Merge pull request #13365 from abbradar/cups-second-attemptDomen Kožar2016-02-26
| |\
| | * cups: 2.0.4 -> 2.1.3Nikolay Amiantov2016-02-22
| * | Merge pull request #12532 from bendlas/update-splixzimbatm2016-02-24
| |\ \ | | |/ | |/|
| | * splix: 2.0.0 -> svn-r315Herwig Hochleitner2016-02-16
| * | cups: add a comment about updatesLuca Bruno2016-02-21
| * | Revert "cups: 2.0.4 -> 2.1.2"Domen Kožar2016-02-20
* | | Merge recent 'staging' into closure-sizeVladimír Čunát2016-02-03
|\| |
| * | Merge branch 'master' into stagingVladimír Čunát2016-01-29
| |\ \
| | * | samsung-unified-linux-driver: add 1.00.37Tobias Geerinckx-Rice2016-01-26
| | * | Add version attribute where maintainers |= nckxTobias Geerinckx-Rice2016-01-25
| | |/
| * | cups_filters: 1.0.71 -> 1.5.0Nikolay Amiantov2016-01-17
| * | cups: 2.0.4 -> 2.1.2Nikolay Amiantov2016-01-17
| |/
* | treewide: Mass replace 'glibc}/lib' to refer the 'out' outputTuomas Tynkkynen2016-01-24
* | Merge branch 'staging' into closure-sizeVladimír Čunát2016-01-19
|\|
| * phantomjs2: build on darwinJude Taylor2016-01-12
| * cups-bjnp: add meta.descriptionBjørn Forsman2016-01-02
| * cups-pk-helper: init at 0.2.5Bjørn Forsman2016-01-01
* | Merge staging into closure-sizeVladimír Čunát2015-11-20
|\|
| * mfcj470dw: tidy upCillian de Róiste2015-10-24
| * mfcj470dw: init at 3.0.0-1Yochai2015-10-23
| * cups-filters: make shell string longer (close #10493)Brandon Dimcheff2015-10-20
* | dbus: split into multiple outputs and fix referrersVladimír Čunát2015-10-13
* | just add comments about outputs (cups, gdk-pixbuf)Vladimír Čunát2015-10-13
* | gtk3: split into multiple outputsVladimír Čunát2015-10-13
* | libxml2,libxslt: split into multiple outputsVladimír Čunát2015-10-05
* | Merge commit staging+systemd into closure-sizeVladimír Čunát2015-10-03
|\|
| * cups: 2.0.3 -> 2.0.4, fix transient failureDomen Kožar2015-09-06
| * Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-08-19
| |\
| | * canon-cups-ufr2: init at 2.90Thomas Strobel2015-08-20
| * | cups: remove xdg_utils dependencyJan Malakhovski2015-08-16
| |/
| * cups: Don't depend on OpenSSLEelco Dolstra2015-07-26
| * cups-filters: update, including security fixesVladimír Čunát2015-07-21
| * cups: 2.0.2 -> 2.0.3William A. Kennington III2015-07-07
| * cups: Use systemd files provided by CUPSJascha Geerds2015-05-10
| * cups: Add xdg_utils to build inputsJascha Geerds2015-05-10
| * cups: Refactor meta attributesJascha Geerds2015-05-10
| * cups: 1.7.5 -> 2.0.2William A. Kennington III2015-05-10
* | Merge staging into closure-sizeVladimír Čunát2015-05-05
|\|
| * cups-browsed: build with AvahiKirill Elagin2015-04-13
| * cups-filters: fix build on non-NixOSKirill Elagin2015-04-13
* | Merge 'staging' into closure-sizeVladimír Čunát2015-04-18
|\|