Am 14.03.2012, 00:01 Uhr, schrieb Albert Astals Cid <aa...@kde.org>:
scripty updates .desktop files every day, so do whatever you want with
them,
it will be correct on the next scripty run, so unless you really break
something the date of the release it doesn't matter.
Good to know =)
(i understand you are merging KDE/4.8 to master)
yes.
If you take KDE/4.8 contents
over the master ones you'll get an extra commit of scripty fixing it to
the
correct master values so you probably want to take the master version
not the KDE/4.8 one
Ok, many thanks, "merge -s ours" then.
I just thought because the 4.8 version seemed to have more text in the
conflicting files
Cheers,
Thomas
