| changeset 1499: |
b969c133c2e3 |
| parent 1497: | 0b3a4e32735d |
|---|
| parent 1494: | ba8d1a1f51b1 |
|---|
| child 1500: | 5f0aa2b71832 |
|---|
| author: |
Johan Euphrosine <proppy@aminche.com> |
| date: |
Thu Jun 25 14:40:30 2009 +0200 (8 months ago) |
| files: |
|
| description: |
merge upstream changes |
--- a/.hgtags Thu Jun 25 14:35:56 2009 +0200
+++ b/.hgtags Thu Jun 25 14:40:30 2009 +0200
@@ -53,3 +53,5 @@
a716ec44edac73a16ca746277245274dca1efa10 jpoker-1.0.16-1
0000000000000000000000000000000000000000 jpoker-1.0.16-1
467f51f7d04b2afe6d7be1a194b09962037b8eb2 jpoker-1.0.16-1
+0000000000000000000000000000000000000000 jpoker-1.0.16-1
+b7de12669a7aae2a5f2f278d68a08f2e13c84e92 jpoker-1.0.16-1