projects
/
scilab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
compact
(merge:
1cfbafc
3c44aef
)
Merge remote-tracking branch 'origin/5.5'
66/16266/1
Vincent COUVERT [Fri, 27 Mar 2015 13:03:04 +0000 (14:03 +0100)]
Conflicts:
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
Change-Id: I2cc39e339204efcc567b0481b12f8fe316e5321a
Trivial merge