[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-12-04 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=945e8f2b00a697856cedcc636ec27aa006ebc64c

commit 945e8f2b00a697856cedcc636ec27aa006ebc64c
Merge: e50c984 222c562
Author: Melko me...@frugalware.org
Date:   Thu Dec 4 19:28:14 2014 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-11-23 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=0d357d81895d1fc94956b6b9246e193ff7bde431

commit 0d357d81895d1fc94956b6b9246e193ff7bde431
Merge: 0be4067 02706ef
Author: Melko me...@frugalware.org
Date:   Sun Nov 23 11:19:37 2014 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-11-11 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=0be4067d9c04793dd667eb5d9b1b730c82448ede

commit 0be4067d9c04793dd667eb5d9b1b730c82448ede
Merge: 1abee93 7994238
Author: Melko me...@frugalware.org
Date:   Tue Nov 11 10:11:59 2014 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-11-01 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=85233bcfe73fefd771ccfc27a6ad8f387cf4c3f8

commit 85233bcfe73fefd771ccfc27a6ad8f387cf4c3f8
Merge: f594fbf 8b401a1
Author: Melko me...@frugalware.org
Date:   Sat Nov 1 15:16:31 2014 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-09-24 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=f594fbffa83f71d7744cc6acc71d45c52043f356

commit f594fbffa83f71d7744cc6acc71d45c52043f356
Merge: 4cd81d6 fb640a4
Author: Melko me...@frugalware.org
Date:   Wed Sep 24 21:22:52 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-09-17 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=9b95b4a080738525065804a729c2f25af3a44e67

commit 9b95b4a080738525065804a729c2f25af3a44e67
Merge: bc0b8db dfa84a9
Author: Melko me...@frugalware.org
Date:   Wed Sep 17 13:37:48 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-09-03 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=bc0b8db8a8b325d69ab9ac3824bfe9bbdea9346a

commit bc0b8db8a8b325d69ab9ac3824bfe9bbdea9346a
Merge: 3beeeff d1f89dd
Author: Melko me...@frugalware.org
Date:   Wed Sep 3 17:24:10 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-08-24 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=938a660809b47b886e665d74645335039695fc0d

commit 938a660809b47b886e665d74645335039695fc0d
Merge: a3d27da 908625b
Author: Melko me...@frugalware.org
Date:   Sun Aug 24 23:11:37 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-07-24 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=a3d27da79b7ca5a43301245f44d663a091e7114b

commit a3d27da79b7ca5a43301245f44d663a091e7114b
Merge: fff958d fcd64ac
Author: Melko me...@frugalware.org
Date:   Thu Jul 24 14:46:40 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-07-17 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=c2b472fe6904b5e8d54da1e72be4f9ee51b17e03

commit c2b472fe6904b5e8d54da1e72be4f9ee51b17e03
Merge: caf0464 3d753be
Author: Melko me...@frugalware.org
Date:   Thu Jul 17 21:55:02 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-06-14 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=caf0464e6904b099caae7e40a62a2fb49765dab6

commit caf0464e6904b099caae7e40a62a2fb49765dab6
Merge: 66f12fb 35205e8
Author: Melko me...@frugalware.org
Date:   Sat Jun 14 18:45:36 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-06-10 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=7980f185dffb5c31b8ece847595d5bf85a6f86ef

commit 7980f185dffb5c31b8ece847595d5bf85a6f86ef
Merge: a95a022 5f02f29
Author: Melko me...@frugalware.org
Date:   Tue Jun 10 17:56:37 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-05-23 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=7fee914442a8f5a646f419bb2b6fd57edfa39e77

commit 7fee914442a8f5a646f419bb2b6fd57edfa39e77
Merge: 13f247e 2d2adcb
Author: Melko me...@frugalware.org
Date:   Fri May 23 17:39:48 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-05-13 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=658fbc10ada1e7e7dda87553d3c2486251aebd11

commit 658fbc10ada1e7e7dda87553d3c2486251aebd11
Merge: 9acc27f 1bc55c2
Author: Melko me...@frugalware.org
Date:   Tue May 13 21:27:05 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-05-02 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=8954923b6b4fff8f6fd63efbe3b08cb21db83239

commit 8954923b6b4fff8f6fd63efbe3b08cb21db83239
Merge: 9b6ee02 975f7aa
Author: Melko me...@frugalware.org
Date:   Fri May 2 17:38:16 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-04-04 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=9b6ee02223925deca8585963ea8b3e121f3ffadf

commit 9b6ee02223925deca8585963ea8b3e121f3ffadf
Merge: d62722b 3c942e6
Author: Melko me...@frugalware.org
Date:   Sat Apr 5 00:27:04 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-04-01 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=c50d1455653de276aa324b58a7da2c2b522e

commit c50d1455653de276aa324b58a7da2c2b522e
Merge: 00edd24 aff8d51
Author: Melko me...@frugalware.org
Date:   Tue Apr 1 17:19:48 2014 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-01-19 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=00edd241367a1fc6db1937c87b92bd54a0e5a1c7

commit 00edd241367a1fc6db1937c87b92bd54a0e5a1c7
Merge: e76ccb9 6ca6575
Author: Melko me...@frugalware.org
Date:   Mon Jan 20 00:50:24 2014 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2014-01-15 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=9d34b6273702e5c57725571ae2ed66094e51e1e3

commit 9d34b6273702e5c57725571ae2ed66094e51e1e3
Merge: b6edaec ed50b0b
Author: Melko me...@frugalware.org
Date:   Wed Jan 15 23:05:46 2014 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-12-24 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=b6edaec9840e44b6507b6ac0350446b51255abee

commit b6edaec9840e44b6507b6ac0350446b51255abee
Merge: 499f396 9c9ae6f
Author: Melko me...@frugalware.org
Date:   Wed Dec 25 01:35:40 2013 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-12-19 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=9db9d3c66470852e75e5ca9f36ba5fc1bc38fa2b

commit 9db9d3c66470852e75e5ca9f36ba5fc1bc38fa2b
Merge: 9910ad9 268bf57
Author: Melko me...@frugalware.org
Date:   Thu Dec 19 16:58:42 2013 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-12-14 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=9910ad97def5b6f8a58044554bb9bd5cc2eb18fd

commit 9910ad97def5b6f8a58044554bb9bd5cc2eb18fd
Merge: 3f345fa 3a6db59
Author: Melko me...@frugalware.org
Date:   Sat Dec 14 10:51:18 2013 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-12-06 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=bb7666d526a28c6c35ac153517303ff0852f78f7

commit bb7666d526a28c6c35ac153517303ff0852f78f7
Merge: c8e5406 5b6e8c7
Author: Melko me...@frugalware.org
Date:   Fri Dec 6 19:04:40 2013 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-11-11 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=e8f09e64a84338e00ed6645de3e99ac6b95077da

commit e8f09e64a84338e00ed6645de3e99ac6b95077da
Merge: f9431f3 9d6a45b
Author: Melko me...@frugalware.org
Date:   Mon Nov 11 22:32:44 2013 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-11-06 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=9135cf002a4e02dfcd5bb6f7df7c9e31992c7547

commit 9135cf002a4e02dfcd5bb6f7df7c9e31992c7547
Merge: e134421 f85b4e7
Author: Melko me...@frugalware.org
Date:   Wed Nov 6 17:56:52 2013 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-10-05 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=660f1f9ae409c051adc4c6fb210e31997ed7412f

commit 660f1f9ae409c051adc4c6fb210e31997ed7412f
Merge: 3c6ba01 f266874
Author: Melko me...@frugalware.org
Date:   Sat Oct 5 17:12:47 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-09-10 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=3c6ba01c215309023b263022562ec8ecfa14968a

commit 3c6ba01c215309023b263022562ec8ecfa14968a
Merge: d70fd98 65d4f86
Author: Melko me...@frugalware.org
Date:   Tue Sep 10 20:39:14 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-09-04 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=eb22ddaced835267a6a49c7319540d57b77d4ae3

commit eb22ddaced835267a6a49c7319540d57b77d4ae3
Merge: 777e4ee 501c409
Author: Melko me...@frugalware.org
Date:   Wed Sep 4 14:57:54 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-08-27 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=1683a58f35f74c2c6f15ea40e0061bcdab3c1f13

commit 1683a58f35f74c2c6f15ea40e0061bcdab3c1f13
Merge: ca32edf a529adf
Author: Melko me...@frugalware.org
Date:   Tue Aug 27 16:35:47 2013 +0200

Merge remote-tracking branch 'current/master'

Conflicts:
source/kde/kdebase-workspace/FrugalBuild

diff --cc source/kde/kdebase-workspace/FrugalBuild
index f41a2fe,8d8587b..5457039
--- a/source/kde/kdebase-workspace/FrugalBuild
+++ b/source/kde/kdebase-workspace/FrugalBuild
@@@ -104,8 -109,9 +109,9 @@@ subdepends=(${subdepends[@]} libsm l
libgcc xfsprogs-acl sqlite3 libqtxmlpatterns=$Qt4)
subrodepends=(${subrodepends[@]} )
subgroups=(${subgroups[@]} 'kde kde-core')
-subreplaces=(${subreplaces[@]} '')
+subreplaces=(${subreplaces[@]} 'libkdesolid 
kdebase-workspace-solid-networkmanager kdebase-workspace-solid-wicd 
kdebase-workspace-solid-modemmanager kdebase-workspace-solid-tools')
subarchs=(${subarchs[@]} 'i686 x86_64')
+ subinstall=(${subinstall[@]} )

subpkgs=(${subpkgs[@]} powerdevil)
subdescs=(${subdescs[@]} A Laptop Power Management Daemon.)
@@@ -294,7 -321,20 +321,8 @@@ subrodepends=(${subrodepends[@]} kde
subgroups=(${subgroups[@]} 'kde kde-core')
subreplaces=(${subreplaces[@]} '')
subarchs=(${subarchs[@]} 'i686 x86_64')
+ subinstall=(${subinstall[@]} kdm.install)

-## libs/solid again? kdelibs has one also .. ?
-## libkde.. , or libsolid-.. ? libworkspacesolid.. ?
-
-subpkgs=(${subpkgs[@]} libkdesolid)
-subdescs=(${subdescs[@]} Solid Control Library.)
-subdepends=(${subdepends[@]} kdelibs-core=$Kde4 libqtgui=$Qt4 
libqtdbus=$Qt4 bzip2 libxext polkit-qt-1)
-subrodepends=(${subrodepends[@]} )
-subgroups=(${subgroups[@]} 'kde kde-core')
-subreplaces=(${subreplaces[@]} '')
-subarchs=(${subarchs[@]} 'i686 x86_64')
-subinstall=(${subinstall[@]} )
-
### plasma split is the biggest work..
### NEVER: BUMP without to check what changed ..

@@@ -614,7 -706,19 +666,8 @@@ subrodepends=(${subrodepends[@]} 
subgroups=(${subgroups[@]} devel-extra kde-build)
subreplaces=(${subreplaces[@]} '')
subarchs=(${subarchs[@]} i686 x86_64)
+ subinstall=(${subinstall[@]} )

-if Fuse NETWORKMANAGER; then
-   subpkgs=(${subpkgs[@]} $pkgname-solid-networkmanager)
-   subdescs=(${subdescs[@]} Solid Module for NetworkManager.)
-   subdepends=(${subdepends[@]} libxrandr libqtxml libsm 
networkmanager=0.9)
-   subrodepends=(${subrodepends[@]} libkdesolid=$Kde4)
-   subgroups=(${subgroups[@]} 'kde-extra') ## for now is -extra
-   subreplaces=(${subreplaces[@]} '')
-   subarchs=(${subarchs[@]} 'i686 x86_64')
-   subinstall=(${subinstall[@]} )
-fi
-
subpkgs=(${subpkgs[@]} $pkgname-docs)
subdescs=(${subdescs[@]} Kdebase Workspace Documentation)
subdepends=(${subdepends[@]} '')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-08-18 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=12fe9e117b35aeb63de3657537a8b1ad2422dfec

commit 12fe9e117b35aeb63de3657537a8b1ad2422dfec
Merge: ee102c0 583dc76
Author: Melko me...@frugalware.org
Date:   Sun Aug 18 14:53:19 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-08-14 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=78a5574d2546d09d89ed9259b7a12c17d6c8b4af

commit 78a5574d2546d09d89ed9259b7a12c17d6c8b4af
Merge: 05c8758 1f612f7
Author: Melko me...@frugalware.org
Date:   Wed Aug 14 09:44:26 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-07-08 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=05c87583cc53ec087dfdfb09497102a56c14ee0b

commit 05c87583cc53ec087dfdfb09497102a56c14ee0b
Merge: f4bb394 96e2312
Author: Melko me...@frugalware.org
Date:   Mon Jul 8 22:27:47 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-07-03 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=e9f4aa23467752fc3ce82aca3e447296a5a96e76

commit e9f4aa23467752fc3ce82aca3e447296a5a96e76
Merge: 4a82960 8bac9f1
Author: Melko me...@frugalware.org
Date:   Wed Jul 3 20:22:13 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-06-09 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=4a82960c80f6f260e7a131f7f9c4cf76886e4aa8

commit 4a82960c80f6f260e7a131f7f9c4cf76886e4aa8
Merge: ff8a781 00fe895
Author: Melko me...@frugalware.org
Date:   Sun Jun 9 18:02:39 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-06-02 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=0b4ba3424b3c0c3a9adbc51f781e86dcebf74c18

commit 0b4ba3424b3c0c3a9adbc51f781e86dcebf74c18
Merge: d428952 fb1da80
Author: Melko me...@frugalware.org
Date:   Sun Jun 2 14:30:26 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-05-16 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=d4289520928a900a6b56d69c0a73ff745d3902bf

commit d4289520928a900a6b56d69c0a73ff745d3902bf
Merge: 8b799c4 214f35f
Author: Melko me...@frugalware.org
Date:   Thu May 16 23:46:15 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-05-06 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=099aa1e55a897450a4e6bd7be4c4b9f390e0f4a4

commit 099aa1e55a897450a4e6bd7be4c4b9f390e0f4a4
Merge: 8169239 b2984cd
Author: Melko me...@frugalware.org
Date:   Mon May 6 21:44:54 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-04-10 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=81692395522ad9efa3cebc5b10e0bff2fb7fd4c2

commit 81692395522ad9efa3cebc5b10e0bff2fb7fd4c2
Merge: 779013d 25a4fa3
Author: Melko me...@frugalware.org
Date:   Wed Apr 10 21:36:41 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-04-02 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=d19042815f3f8338168ce8a9119ddb5aced4f0e2

commit d19042815f3f8338168ce8a9119ddb5aced4f0e2
Merge: 9f3e7bb 10d5bb9
Author: Melko me...@frugalware.org
Date:   Tue Apr 2 23:45:51 2013 +0200

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-03-11 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=9f3e7bb755004f7fc6284836a9cbc36c9df10e9b

commit 9f3e7bb755004f7fc6284836a9cbc36c9df10e9b
Merge: d8294c6 b71fdaa
Author: Melko me...@frugalware.org
Date:   Tue Mar 12 00:13:38 2013 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-03-05 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=3557b6574f572aef64e6000ea35f370bd33e3c33

commit 3557b6574f572aef64e6000ea35f370bd33e3c33
Merge: 643cd59 eb9ca29
Author: Melko me...@frugalware.org
Date:   Tue Mar 5 18:43:30 2013 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-02-18 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=643cd590117e276f061f4ce775ea7b1354376ec1

commit 643cd590117e276f061f4ce775ea7b1354376ec1
Merge: 93214ab 8be761f
Author: Melko me...@frugalware.org
Date:   Sun Feb 17 23:54:33 2013 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-02-13 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=44af0582afb260e85254fa761f06cacd9ea699cf

commit 44af0582afb260e85254fa761f06cacd9ea699cf
Merge: 473da7f df26784
Author: Melko me...@frugalware.org
Date:   Wed Feb 13 09:35:59 2013 +0100

Merge remote-tracking branch 'current/master'

Conflicts:
source/apps/soprano/FrugalBuild
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] kdebump2: Merge remote-tracking branch 'current/master'

2013-02-06 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=574dd03f7743a4b3adc0f435f577fb1e85ad4a71

commit 574dd03f7743a4b3adc0f435f577fb1e85ad4a71
Merge: 715c76a efb8e90
Author: Melko me...@frugalware.org
Date:   Wed Feb 6 11:17:41 2013 +0100

Merge remote-tracking branch 'current/master'
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git