diff --git a/client/revision b/client/revision index 941253553..fc773d33a 100644 --- a/client/revision +++ b/client/revision @@ -1 +1 @@ -0.99.49.74 +0.99.49.75 diff --git a/docs/ChangeLog b/docs/ChangeLog index 9ad32bd69..242b6ba78 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,4 @@ +<<<<<<< HEAD commit e857c01a58476aaecd945e60d182fc7b85c2fb01 Author: Fabio Erculiani Date: Fri Sep 24 14:25:56 2010 +0200 @@ -130,6 +131,8 @@ Date: Sat Sep 18 22:24:19 2010 +0100 [i18n] Update nl translation +======= +>>>>>>> Tagging Entropy version 0.99.49.75 commit 5b8fd5e28b156c5f734ad51e652b05f1fad25fba Author: Fabio Erculiani Date: Sat Sep 18 14:19:35 2010 +0200 diff --git a/libraries/entropy/revision b/libraries/entropy/revision index 941253553..902d2a09d 100644 --- a/libraries/entropy/revision +++ b/libraries/entropy/revision @@ -1 +1,5 @@ +<<<<<<< HEAD 0.99.49.74 +======= +0.99.49.75 +>>>>>>> Tagging Entropy version 0.99.49.75 diff --git a/server/revision b/server/revision index 941253553..fc773d33a 100644 --- a/server/revision +++ b/server/revision @@ -1 +1 @@ -0.99.49.74 +0.99.49.75 diff --git a/sulfur/src/sulfur/revision b/sulfur/src/sulfur/revision index 941253553..902d2a09d 100644 --- a/sulfur/src/sulfur/revision +++ b/sulfur/src/sulfur/revision @@ -1 +1,5 @@ +<<<<<<< HEAD 0.99.49.74 +======= +0.99.49.75 +>>>>>>> Tagging Entropy version 0.99.49.75