Tagging Entropy version 0.99.49.75

This commit is contained in:
Fabio Erculiani
2010-09-24 20:15:07 +02:00
parent 89f97c21ce
commit 9cb13f6aef
5 changed files with 13 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
0.99.49.74
0.99.49.75
+3
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
commit e857c01a58476aaecd945e60d182fc7b85c2fb01
Author: Fabio Erculiani <lxnay@sabayon.org>
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 <lxnay@sabayon.org>
Date: Sat Sep 18 14:19:35 2010 +0200
+4
View File
@@ -1 +1,5 @@
<<<<<<< HEAD
0.99.49.74
=======
0.99.49.75
>>>>>>> Tagging Entropy version 0.99.49.75
+1 -1
View File
@@ -1 +1 @@
0.99.49.74
0.99.49.75
+4
View File
@@ -1 +1,5 @@
<<<<<<< HEAD
0.99.49.74
=======
0.99.49.75
>>>>>>> Tagging Entropy version 0.99.49.75