<div>Since we are going to rewrite your code, it wouldn't be interesting to update our files from yours. There would be conflits each time we merge :)<br></div><div><br></div><div>But I may have misunderstood your idea...?</div>
<br><div class="gmail_quote">2009/8/28 Peter Garrett <span dir="ltr"><<a href="mailto:inx-one@optusnet.com.au">inx-one@optusnet.com.au</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
On Fri, 28 Aug 2009 13:36:23 +0200<br>
<div class="im">piero <<a href="mailto:piero@linuxquimper.org">piero@linuxquimper.org</a>> wrote:<br>
<br>
</div><div class="im">> okay, I wasn't looking the good file, sorry ! (reader / menu). And<br>
> /usr/lib/inx/ is terra incognita for me <:-)<br>
<br>
</div>You guys have removed most of the files from scriptsandfunctions / trunk<br>
from your branch - this probably is not a good idea.<br>
<br>
I think you should merge from trunk each time before making changes to<br>
your branch - if there are no changes bzr will tell you so - later on<br>
when we merge translations there could be major confusion and conflicts<br>
otherwise...<br>
<br>
We need to be working on the same code base all the time.<br>
<div class="im"><br>
Peter<br>
--<br>
"INX Is Not X" Live CD based on Ubuntu 8.04 : <a href="http://inx.maincontent.net" target="_blank">http://inx.maincontent.net</a><br>
Screenshots slideshow: <a href="http://inx.maincontent.net/album/1.png.html" target="_blank">http://inx.maincontent.net/album/1.png.html</a><br>
_______________________________________________<br>
</div><div><div class="h5">Inx mailing list<br>
<a href="mailto:Inx@lists.inx.maincontent.net">Inx@lists.inx.maincontent.net</a><br>
<a href="http://lists.inx.maincontent.net/listinfo.cgi/inx-inx.maincontent.net" target="_blank">http://lists.inx.maincontent.net/listinfo.cgi/inx-inx.maincontent.net</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br>AddiKT1ve <<a href="http://www.doneed.net">http://www.doneed.net</a>><br>