eFlore/Applications.coelApplications.annuaireApplications.bazarApplications.dictionnaireApplications.frameworkApplications.galerieApplications.gttApplications.papyrusApplications.projetApplications.referentielApplications.reseauApplications.wikinieFlore/Applications.bibliobotaeFlore/Applications.celeFlore/Applications.cel-consultationeFlore/Applications.coel-consultationeFlore/Applications.deleFlore/Applications.eflore-consultationeFlore/Applications.moissonnageeFlore/Archives.cel-v1eFlore/Archives.cel-v2eFlore/Archives.chorologieeFlore/Archives.eflore-consultation-v1eFlore/Archives.eflore-consultation-v2eFlore/Archives.eflore-xuleFlore/Archives.herbierseFlore/Projets.communeseFlore/Projets.eflore-projetsSites.gentiana.orgSites.obs-saisons.frSites.outils-naturalistes.frSites.tela-botanica.org

BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/src/org/tela_botanica/client/modeles/publication/ @ 1416

  → /trunk/src/org/tela_botanica/client/modeles/publication/ @ 1417

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

No changes between revisions

Ignore whitespace Rev 1416 → Rev 1417

/trunk/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:r1209-1382
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java:r1383-1416

/trunk/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:r1209-1382
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java:r1383-1416

/trunk/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:r1209-1382
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java:r1383-1416

/trunk/src/org/tela_botanica/client/modeles/publication/Publication.java
Property changes:
Modified: svn:mergeinfo
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/Publication.java:r1383-1416
Merged /trunk/src/org/tela_botanica/client/modeles/publication/Publication.java:r1209-1382

/trunk/src/org/tela_botanica/client/modeles/publication/PublicationListe.java
Property changes:
Modified: svn:mergeinfo
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/PublicationListe.java:r1383-1416
Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationListe.java:r1209-1382

/trunk/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:r1209-1382
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java:r1383-1416