[code-saturne] 02/03: Merge tag 'upstream/3.3.4+repack'

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository code-saturne.

commit 275d35831f985c901284fa78813f2131d9a71367
Merge: 124feec ad1cfb1
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Mar 30 21:46:26 2015 +0200

    Merge tag 'upstream/3.3.4+repack'
    
    Upstream version 3.3.4+repack

 ChangeLog                                          |  2129 +-
 ChangeLog.2007                                     |  1389 -
 ChangeLog.2008                                     |  3442 --
 ChangeLog.2009                                     |  4169 --
 ChangeLog.2010                                     |  4940 --
 ChangeLog.2011                                     |  8206 ---
 ChangeLog.2012                                     |  7223 ---
 ChangeLog.2013                                     |  6898 ---
 ChangeLog.old                                      | 19218 ------
 Makefile.am                                        |    14 +-
 NEWS                                               |    33 +-
 docs/theory/Makefile.am                            |     4 +-
 docs/user/Makefile.am                              |     4 +-
 extras/changelog/ChangeLog.base                    | 59108 +++++++++++++++++++
 po/fr.po                                           |     3 +-
 src/base/cs_c_bindings.f90                         |    17 +
 src/base/cs_control.c                              |     6 +-
 src/base/cs_field.c                                |    12 +-
 src/base/cs_time_moment.c                          |    89 +-
 src/base/cscpfb.f90                                |   157 +-
 src/ctwr/ctphyv.f90                                |     2 +-
 src/gui/cs_gui.c                                   |     2 +-
 src/lagr/cs_lagr_tracking.c                        |     2 +-
 src/pprt/ppthch.f90                                |     2 +-
 src/rayt/raydom.f90                                |     3 +-
 src/turb/cs_les_filter.c                           |   193 +-
 src/turb/cs_les_filter.h                           |    20 +
 src/turb/visdyn.f90                                |   146 +-
 src/user/cs_user_initialization.f90                |     1 +
 ...s_user_extra_operations-parallel_operations.f90 |     8 +-
 30 files changed, 59593 insertions(+), 57847 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/code-saturne.git