[Uml-devel] branches/work/isi-umbrello/scripts/kde-emacs

[Kevin Ottens]

Le Jeudi 7 Décembre 2006 20:31, Thibault Normand a écrit :
> SVN commit 611351 by tnormand:
>
> #MERGE Trunk(611343) kdesdk/isi-umbrello

I think you wanted to merge from 610596 to get the full changes in kdesdk 
since you branched.

>  M  +1 -0      kde-emacs-bindings.el
>  M  +9 -2      kde-emacs-general.el
>  M  +67 -18    kde-emacs-utils.el

Because well, obviously you only merged the changes in the kde-emacs 
scripts. :-)

Regards.
-- 
Kévin 'ervin' Ottens, http://ervin.ipsquad.net
"Ni le maître sans disciple, Ni le disciple sans maître,
Ne font reculer l'ignorance."
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/umbrello-devel/attachments/20061207/e248c266/attachment.sig>