[prev in list] [next in list] [prev in thread] [next in thread] 

List:       klik-devel
Subject:    [klik-devel] How to deal with "m3" branch... (was: ' [klikclient
From:       Kurt Pfeifle <k1pfeifle () gmx ! net>
Date:       2008-02-19 12:43:17
Message-ID: 47BACEE5.9050602 () gmx ! net
[Download RAW message or body]

I notice that the change below has only been applied to trunk. I assume
however, that probono had the intention to "fix a bug" here, and make
that change appear in all FOSDEM demos as well.

So here is a reminder about how to handle our current "trunk" and
"branches/m3" branches:

   -------------------------------------------------------------------
   Only bugfixes allowed in "m3" branch.

   New features or major code changes have to go to trunk (as before).

   The "m3" branch will be used for our FOSDEM demos.

   *Remember* *to* *apply* *any* *bugfixes* *you* *do* *for* *m3* *to*
   *trunk* *as* *well* (if appropriate). Backport all fixes which you
   put into trunk also to the m3 branch (if appropriate).

   If you fix an issue reported in our tracker, please add an extra
   line to your commit log message like this:

   FIX for #159
   -------------------------------------------------------------------


codesite-noreply@google.com wrote:

> Author: klik.atekon.de
> Date: Tue Feb 19 01:26:08 2008
> New Revision: 1174
> 
> Modified:
>    trunk/client/trunk/cmg_kthumbnail/src/isofsthumbnail.desktop
> 
> Log:
> Renamed "Klik2 Application" to "Compressed Application Image (klik)"
> 
> 
> Modified: trunk/client/trunk/cmg_kthumbnail/src/isofsthumbnail.desktop
> ==============================================================================
> --- trunk/client/trunk/cmg_kthumbnail/src/isofsthumbnail.desktop	(original)
> +++ trunk/client/trunk/cmg_kthumbnail/src/isofsthumbnail.desktop	Tue 
> Feb 19 01:26:08 2008
> @@ -1,7 +1,7 @@
>  [Desktop Entry]
>  Encoding=UTF-8
>  Type=Service
> -Name=Klik2 Application
> +Name=Compressed Application Image (klik)
>  ServiceTypes=ThumbCreator
>  MimeTypes=application/x-extension-cmg
>  X-KDE-Library=isofsthumbnail
> _______________________________________________


-- 
Kurt Pfeifle
System & Network Printing Consultant ---- Linux/Unix/Windows/Samba/CUPS

_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]