From 14ba276e37092a8461684c25c19f1ec95d62b2c9 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Fri, 24 Sep 2010 20:18:29 +0200
Subject: [PATCH] Tagging Entropy version 0.99.49.76

---
 client/revision            |  2 +-
 docs/ChangeLog             | 45 +++++++++++++++++++++++++++++++++++---
 libraries/entropy/revision |  6 +----
 server/revision            |  2 +-
 sulfur/src/sulfur/revision |  6 +----
 5 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/client/revision b/client/revision
index fc773d33a..8e11f1669 100644
--- a/client/revision
+++ b/client/revision
@@ -1 +1 @@
-0.99.49.75
+0.99.49.76
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 242b6ba78..ed1d71695 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,4 +1,45 @@
-<<<<<<< HEAD
+commit 9cb13f6aeffe4d90c61b34a83837e43e08a5cc8b
+Author: Fabio Erculiani <lxnay@sabayon.org>
+Date:   Fri Sep 24 20:15:07 2010 +0200
+
+    Tagging Entropy version 0.99.49.75
+
+commit 89f97c21ce49b0df281bf92b2ff1480b7daba8ee
+Author: Fabio Erculiani <lxnay@sabayon.org>
+Date:   Fri Sep 24 19:47:32 2010 +0200
+
+    [todo] update TODO
+
+commit 37ac11117a64880ff26baead9bd7b9302d2e7083
+Author: Fabio Erculiani <lxnay@sabayon.org>
+Date:   Fri Sep 24 19:25:46 2010 +0200
+
+    [sulfur] lock "Update all" button when application is in locked status
+
+commit 7f9fdb274c5bafce63c4541614edf60d93265ce2
+Author: Fabio Erculiani <lxnay@sabayon.org>
+Date:   Fri Sep 24 19:25:22 2010 +0200
+
+    [sulfur] make possible to test application in locked status via "--locked" argv
+
+commit f7dc6786164317a72a1a03880efba314216e7077
+Author: Fabio Erculiani <lxnay@sabayon.org>
+Date:   Fri Sep 24 14:52:10 2010 +0200
+
+    [po] update translations
+
+commit c2e7f3b51b2ea2dab56d0ee394733c2a8bb6127b
+Author: Fabio Erculiani <lxnay@sabayon.org>
+Date:   Fri Sep 24 14:27:59 2010 +0200
+
+    [entropy.db] EntropyRepository: small sqlite3 performance improvement, make it store temp tables in RAM
+
+commit 32c887e2989a14ca40346800eefef36dfea1df53
+Author: Fabio Erculiani <lxnay@sabayon.org>
+Date:   Fri Sep 24 14:26:50 2010 +0200
+
+    Tagging Entropy version 0.99.49.74
+
 commit e857c01a58476aaecd945e60d182fc7b85c2fb01
 Author: Fabio Erculiani <lxnay@sabayon.org>
 Date:   Fri Sep 24 14:25:56 2010 +0200
@@ -131,8 +172,6 @@ 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 <lxnay@sabayon.org>
 Date:   Sat Sep 18 14:19:35 2010 +0200
diff --git a/libraries/entropy/revision b/libraries/entropy/revision
index 902d2a09d..8e11f1669 100644
--- a/libraries/entropy/revision
+++ b/libraries/entropy/revision
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0.99.49.74
-=======
-0.99.49.75
->>>>>>> Tagging Entropy version 0.99.49.75
+0.99.49.76
diff --git a/server/revision b/server/revision
index fc773d33a..8e11f1669 100644
--- a/server/revision
+++ b/server/revision
@@ -1 +1 @@
-0.99.49.75
+0.99.49.76
diff --git a/sulfur/src/sulfur/revision b/sulfur/src/sulfur/revision
index 902d2a09d..8e11f1669 100644
--- a/sulfur/src/sulfur/revision
+++ b/sulfur/src/sulfur/revision
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0.99.49.74
-=======
-0.99.49.75
->>>>>>> Tagging Entropy version 0.99.49.75
+0.99.49.76