[scilab: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/scilab

[Clément David]

commit f435ea04a950cecfb23f9ef360ece17a191763df
Merge: ac0e4f5 77f43df
Author: Clément DAVID <davidcl at fedoraproject.org>
Date:   Tue Apr 3 08:53:55 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/scilab
    
    Conflicts:
    	scilab.spec

 scilab.spec |   72 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 33 insertions(+), 39 deletions(-)
---
diff --cc scilab.spec
index 8c71494,5f0f4fb..4e93a14
--- a/scilab.spec
+++ b/scilab.spec
@@@ -286,9 -268,9 +277,12 @@@ s:%lang(C) :
  %{_datadir}/%{name}/modules/*/tests
  
  %changelog
 +* Tue Apr 03 2012 Clément David <c.david86 at gmail.com> - 5.4.0-0.1.20120403snap
 +- Update to 5.4.0 nightly builds
 +
+ * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.3-10
+ - Rebuilt for c++ ABI breakage
+ 
  * Mon Feb 10 2012 Clément David <c.david86 at gmail.com> - 5.3.3-9
  - Update classpath.xml due to the jhdf5 move.