Merge branch 'master' of /home/dsarrut/clitk3.server

diff --git a/Licence_CeCILL-B_V1-en.txt b/Licence_CeCILL-B_V1-en.txt
index fc5e8141bc9fa3797d4d0f74b16d64a3200cc7db..3ad4deaa3c84895c0ac4e6e7c74902b31d7b6e94 100644 (file)
--- a/Licence_CeCILL-B_V1-en.txt
+++ b/Licence_CeCILL-B_V1-en.txt
@@ -1,20 +1,3 @@
-/*=========================================================================
-  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
-
-  Authors belong to:
-  - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://www.centreleonberard.fr
-  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
-
-  This software is distributed WITHOUT ANY WARRANTY; without even
-  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the copyright notices for more information.
-
-  It is distributed under dual licence
-
-  - BSD        See included LICENSE.txt file
-  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-===========================================================================*/
 
 CeCILL-B FREE SOFTWARE LICENSE AGREEMENT
 

diff --git a/notes.org~ b/notes.org~
deleted file mode 100644 (file)
index db3e8d1..0000000
--- a/notes.org~
+++ /dev/null
@@ -1,27 +0,0 @@
-
-* GIT emacs command
-C-x v d 
-.gitignore -> contains ignored files (recursive)
-commit (local)
-push (repository)
-pull
-
-gitk for GUI
-meld / kdiff3
-
-git status
-git add (-> index)
-git commit (->local commit)
-git pull (fetch + merge)
-git push
-
-COMMIT : C-x g c f
-(git-commit-file &optional AMEND)
-
-* Test in temp
-git clone http://www.creatis.insa-lyon.fr/~dsarrut/clitk3.pub.git clitk3
-need itk4 (git) ?
-
-
-* git merge cvs
-