[SCM] FreeFem++ packaging branch, pristine-tar, updated. 890cf18079de5ca6312677942a13cd3f6b0c694d

[Dimitrios Eftaxiopoulos]

The following commit has been merged in the pristine-tar branch:
commit 890cf18079de5ca6312677942a13cd3f6b0c694d
Merge: 7b13c657d4452d899ae46d7b7a9c29db23fce6c2 6beaa3a6c5cd5edbcd8c4fa064950179dc2c1b67
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Sun Feb 20 21:08:56 2011 +0200

    pristine-tar data for freefem++_3.12.orig.tar.gz
    
    Conflicts:
    	freefem++_3.12.orig.tar.gz.delta
    	freefem++_3.12.orig.tar.gz.id

diff --combined freefem++_3.12.orig.tar.gz.id
index b485162,7003b05..87992d4
--- a/freefem++_3.12.orig.tar.gz.id
+++ b/freefem++_3.12.orig.tar.gz.id
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +a89113e5625a913bec0c37a218d1851a9ec55b4f
++=======
+ 7a7611ee55c844e2d266b1d6222ee68edbb57a3b
++>>>>>>> 6beaa3a6c5cd5edbcd8c4fa064950179dc2c1b67

-- 
FreeFem++ packaging