El Dilluns, 9 de març de 2015, a les 14:08:40, Thomas Lübking va escriure:
> On Sonntag, 8. März 2015 23:21:59 CEST, Albert Astals Cid wrote:
> > Short answer: The one you're in (i.e. in this case i guess HEAD/master)
>
> ¡Muchas Gracias!
>
> > I have the feeling this has been asked/answered quit
Morning
I’m close to being back to KDE joy and work. Just one last exam on Thursday
and I’m done with my final exams. But let’s concentrate on the subject.
For the topic of the Randa Meetings this year it’s planned to focus on
tablet/smartphone and touch platforms and make our software fit for
On Sonntag, 8. März 2015 23:21:59 CEST, Albert Astals Cid wrote:
Short answer: The one you're in (i.e. in this case i guess HEAD/master)
¡Muchas Gracias!
I have the feeling this has been asked/answered quite a few
times, anyone has any idea of a place where to put such a FAQ so that people
On Montag, 9. März 2015 09:47:20 CEST, Kevin Funk wrote:
This is easy to automate with .gitattributes, for the record
Wuohohooo... wait!
That would also kill "real" fixes (typos, removed/added keys) on merging and if
you didn't think of it, you'll have it fixed in branch and re-broken in mas
Excerpts from Albert Astals Cid's message of 2015-03-08 23:41:20 +0100:
> El Diumenge, 8 de març de 2015, a les 11:02:51, Stefano Crocco va escriure:
> > Hello to everyone,
> > I'm trying to port the User Agent Changer Konqueror plugin to KF5 (note that
> > I'm not the original developer of the plu
On Sunday 08 March 2015 23:21:59 Albert Astals Cid wrote:
> El Diumenge, 8 de març de 2015, a les 22:00:33, Thomas Lübking va escriure:
> > merging 5.2 into master gets me several merge conflicts in desktop
> > services, which I cannot reasonably resolve, mostly because:
> >
> > ++<<< HEAD
> >
