r36490 - in /packages/fenics: dolfin/trunk/debian/ ferari/trunk/debian/ fiat/trunk/debian/ instant/trunk/debian/ syfi/trunk/debian/ ufc/trunk/debian/ ufl/trunk/debian/ viper/trunk/debian/

[johannr-guest at users.alioth.debian.org]

Author: johannr-guest
Date: Wed May 19 09:48:40 2010
New Revision: 36490

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36490
Log:
Use merge mode.

Modified:
    packages/fenics/dolfin/trunk/debian/   (props changed)
    packages/fenics/ferari/trunk/debian/   (props changed)
    packages/fenics/fiat/trunk/debian/   (props changed)
    packages/fenics/instant/trunk/debian/   (props changed)
    packages/fenics/syfi/trunk/debian/   (props changed)
    packages/fenics/ufc/trunk/debian/   (props changed)
    packages/fenics/ufl/trunk/debian/   (props changed)
    packages/fenics/viper/trunk/debian/   (props changed)

Propchange: packages/fenics/dolfin/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Propchange: packages/fenics/ferari/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Propchange: packages/fenics/fiat/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Propchange: packages/fenics/instant/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Propchange: packages/fenics/syfi/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Propchange: packages/fenics/ufc/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Propchange: packages/fenics/ufl/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Propchange: packages/fenics/viper/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1