.hgtags.orig
author Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Thu, 27 May 2010 13:40:48 +0300
changeset 23 89e065397ea6
parent 18 2f34d5167611
permissions -rw-r--r--
Revision: 201019 Kit: 2010121

1feb9c6c762b0e860029307505f470d6484e9c5f custom-1
087615328ac651b783d035958497dec12b6b6299 custom-2
a7a1ee9e1f6fe82021437cfcc11f84015f443561 custom-3
e109b49aa138a5becb0b5fdfcbb0f815bb39f757 custom-4
e109b49aa138a5becb0b5fdfcbb0f815bb39f757 custom-4
0000000000000000000000000000000000000000 custom-4
0000000000000000000000000000000000000000 custom-4
a10e63995797662a94cda7ffb2771045e06a4ead custom-4
1c1aedc450b08bf324aca2cf09f7fbb50356e90a prep-0950
928fc6c151338f58cedfd7dfd0d49ae2364768df prep-0950-1
<<<<<<< local
d24e717df027d42be7c49d52c01c86de18ff0a31 prep-1005
=======
72d62b5ea7c7483580651eb06fef064ad1b00f93 prep-0950-2
4f1cd8b154bccb51ebea888b9c8883844b446823 prep-0950-3
a5c6307e77d9c4196af51f2431962466e70c44ff prep-0950-4
aa8ac826d88e77d5606edf39da872eb71479a140 prep-0950-5
9e3f511af4433d56aadab41c75b92ef9f6360a0d prep-1003
>>>>>>> other