Subversion Repositories eFlore/Applications.coel

Compare Revisions

This comparison shows the changes necessary to convert path

→ /branches/v1.8-narince/src/org/tela_botanica/client/modeles/ @ 1880

→ /branches/v1.8-narince/src/org/tela_botanica/client/modeles/ @ 1881

↔ Reverse comparison
Compare Path: Rev

With Path: Rev

No changes between revisions

Ignore whitespace Rev 1880 → Rev 1881

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureConservation.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureConservation.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/Structure.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/structure/Structure.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/InterneValeur.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/InterneValeur.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/InterneValeurListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/InterneValeurListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/Information.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/Information.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/Publication.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/publication/Publication.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/Valeur.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/Valeur.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/ValeurListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/ValeurListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/Aide.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/Aide.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/Menu.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/Menu.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/MenuApplicationId.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/MenuApplicationId.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/aDonnee.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/aDonnee.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/Personne.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/personne/Personne.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/PersonneListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/personne/PersonneListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/Utilisateur.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/Utilisateur.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/aDonneeListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/aDonneeListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/UniteBase.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/UniteBase.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/UniteRangement.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/UniteRangement.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/Collection.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/Collection.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionListe.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionListe.java:r1878-1880

/branches/v1.8-narince/src/org/tela_botanica/client/modeles/.
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles:r1878-1880