[Scilab-Dev] Merging branches

[François Vogel]

Pierre MARECHAL said on 30/10/2008 15:13:
> With exactly the same commands on my ubuntu, I have not encountered any 
> problem  

Works for me too now. Could not understand why it failed.

> http://gitweb.scilab.org/?p=scilab.git;a=shortlog;h=refs/heads/scipad
> Just one conflict to resolve : 
> http://gitweb.scilab.org/?p=scilab.git;a=commit;h=7db8fe7f2465717d1e045a2f8b5afb8eaaf7739a 

Both links you give above result for me in:

403 Forbidden - No such project

Francois