| changeset 1504: |
810c382534b5 |
| parent 1503: | 1b77c5fa11d3 |
|---|
| parent 1502: | 5332b6ed12b8 |
|---|
| child 1505: | 52c1599c5b4b |
|---|
| author: |
Johan Euphrosine <proppy@aminche.com> |
| date: |
Fri Jun 26 11:24:02 2009 +0200 (8 months ago) |
| files: |
|
| description: |
merge upstream changes |
--- a/.hgtags Fri Jun 26 11:20:23 2009 +0200
+++ b/.hgtags Fri Jun 26 11:24:02 2009 +0200
@@ -55,3 +55,5 @@
467f51f7d04b2afe6d7be1a194b09962037b8eb2 jpoker-1.0.16-1
0000000000000000000000000000000000000000 jpoker-1.0.16-1
b7de12669a7aae2a5f2f278d68a08f2e13c84e92 jpoker-1.0.16-1
+0000000000000000000000000000000000000000 jpoker-1.0.16-1
+7a9ea85a3fc5086953bbcb2910382965690d71d0 jpoker-1.0.16-1