| /trunk/src/org/tela_botanica/client/vues/publication/PublicationVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication/PublicationVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/publication/PublicationForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationForm.java:r1209-1382 |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication/PublicationForm.java:r1383-1416 |
| /trunk/src/org/tela_botanica/client/vues/publication/. |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/publication:r1383-1416 |
| Merged /trunk/src/org/tela_botanica/client/vues/publication:r1209-1382 |