Re: [Tellico-users] Merging Tellico frameworks branch into master

2015-08-01 Thread Robby Stephenson
On 07/27/2015 04:27 AM, Albert Astals Cid wrote: El Diumenge, 26 de juliol de 2015, a les 15:46:44, Robby Stephenson va escriure: Should I remove the frameworks branch altogether? What's the right way to do that, if so? Yes git push origin :frameworks You may not have enough permissions to

Re: [Tellico-users] Merging Tellico frameworks branch into master

2015-07-27 Thread Albert Astals Cid
El Diumenge, 26 de juliol de 2015, a les 15:46:44, Robby Stephenson va escriure: > On 07/01/2015 08:47 PM, Robby Stephenson wrote: > > I plan to merge the Tellico frameworks branch into master soon, > > probably this weekend. The master branch is currently KDE4/Qt4 based, > > so this is a chang

Re: [Tellico-users] Merging Tellico frameworks branch into master

2015-07-26 Thread Luigi Toscano
In data domenica 26 luglio 2015 15:46:44, Robby Stephenson ha scritto: > > On 07/02/2015 02:54 AM, Alexander Potashev wrote: > > You need to update the i18n setup at > > https://projects.kde.org/projects/extragear/office/tellico on the > > Settings->Repository page. If you have only one branch

Re: [Tellico-users] Merging Tellico frameworks branch into master

2015-07-26 Thread Robby Stephenson
On 07/01/2015 08:47 PM, Robby Stephenson wrote: > I plan to merge the Tellico frameworks branch into master soon, > probably this weekend. The master branch is currently KDE4/Qt4 based, > so this is a change to requiring Qt5 and KDE frameworks. It took me longer than expected, but I just complete

Re: Merging Tellico frameworks branch into master

2015-07-02 Thread Alexander Potashev
2015-07-02 23:48 GMT+03:00 Albert Astals Cid : > El Dijous, 2 de juliol de 2015, a les 09:54:56, Alexander Potashev va > escriure: >> If you are not going to develop for Qt4/KDELibs4 in the master branch >> anymore, it may be easier to _rename_ the frameworks branch into >> master. > > I disagree,

Re: Merging Tellico frameworks branch into master

2015-07-02 Thread Albert Astals Cid
El Dijous, 2 de juliol de 2015, a les 09:54:56, Alexander Potashev va escriure: > Hi Robby, > > 2015-07-02 3:47 GMT+03:00 Robby Stephenson : > > I plan to merge the Tellico frameworks branch into master soon, probably > > this weekend. The master branch is currently KDE4/Qt4 based, so this is a >

Re: Merging Tellico frameworks branch into master

2015-07-01 Thread Alexander Potashev
Hi Robby, 2015-07-02 3:47 GMT+03:00 Robby Stephenson : > I plan to merge the Tellico frameworks branch into master soon, probably > this weekend. The master branch is currently KDE4/Qt4 based, so this is a > change to requiring Qt5 and KDE frameworks. If you are not going to develop for Qt4/KDELi

Merging Tellico frameworks branch into master

2015-07-01 Thread Robby Stephenson
I plan to merge the Tellico frameworks branch into master soon, probably this weekend. The master branch is currently KDE4/Qt4 based, so this is a change to requiring Qt5 and KDE frameworks. I'm not sure what I may need to do to update the CI build information or any of the i18n setup. Please