| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java:r1209-1382 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionForm.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionForm.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/collection/. |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection:r1383-1416 |