/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/ListeUtilisateurAdminVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/ListeUtilisateurAdminVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/BarrePaginationVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/BarrePaginationVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/SaisieMotsClesVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/SaisieMotsClesVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/filtres/ArbreDateObservationFiltreVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/filtres/ArbreDateObservationFiltreVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/filtres/ArbreMotsClesObservationVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/filtres/ArbreMotsClesObservationVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/filtres/ArbreEntiteGeographiqueObservationFiltreVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/filtres/ArbreEntiteGeographiqueObservationFiltreVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/indicateurs/MiniZoomImageVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/indicateurs/MiniZoomImageVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/indicateurs/InformationRepartitionVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/indicateurs/InformationRepartitionVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/indicateurs/ImageGeneriqueVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/indicateurs/ImageGeneriqueVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/ListeObservationVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/ListeObservationVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/MotsClesObsVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/MotsClesObsVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/FormulaireSaisieObservationVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/FormulaireSaisieObservationVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/observation/MenuObservationVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/observation/MenuObservationVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/PanneauMetadonneesVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/PanneauMetadonneesVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/BarreOutilsVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/BarreOutilsVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/MenuIdVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/MenuIdVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/OptionsImages.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/OptionsImages.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/ListeImageVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/ListeImageVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/MenuLiaisonVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/MenuLiaisonVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/BarreNotationVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/BarreNotationVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/MenuImageVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/MenuImageVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/ZoomImageVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/ZoomImageVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/filtres/PanneauFiltresImagesVues.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/filtres/PanneauFiltresImagesVues.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/filtres/BarreRechercheFiltreVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/filtres/BarreRechercheFiltreVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/filtres/SelectionFiltreVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/filtres/SelectionFiltreVue.java:r2758,2760-2766 |
/branches/v2.23-rouleau/src/org/tela_botanica/client/vues/image/MiniListeObservationVue.java |
---|
Property changes: |
Modified: svn:mergeinfo |
Merged /trunk/src/org/tela_botanica/client/vues/image/MiniListeObservationVue.java:r2758,2760-2766 |