Mercurial > cpython-lru_cache-weakref

comparison PCbuild/pythoncore.vcproj @ 44400:41bfbfc36cf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed svn merge issues
author Christian Heimes <christian@cheimes.de>
date Mon, 31 Dec 2007 16:44:35 +0000
parents 6556f3f22c19
children b91ca87e6f32
comparison
equal deleted inserted replaced
44399:446e8b607bd3 44400:41bfbfc36cf7
649 <File 649 <File
650 RelativePath="..\Include\boolobject.h" 650 RelativePath="..\Include\boolobject.h"
651 > 651 >
652 </File> 652 </File>
653 <File 653 <File
654 RelativePath="..\Include\bufferobject.h" 654 RelativePath="..\Include\bytes_methods.h"
655 >
656 </File>
657 <File
658 RelativePath="..\Include\bytesobject.h"
655 > 659 >
656 </File> 660 </File>
657 <File 661 <File
658 RelativePath="..\Include\cellobject.h" 662 RelativePath="..\Include\cellobject.h"
659 > 663 >
718 RelativePath="..\Include\fileobject.h" 722 RelativePath="..\Include\fileobject.h"
719 > 723 >
720 </File> 724 </File>
721 <File 725 <File
722 RelativePath="..\Include\floatobject.h" 726 RelativePath="..\Include\floatobject.h"
727 >
728 </File>
729 <File
730 RelativePath="..\Include\formatter_unicode.h"
723 > 731 >
724 </File> 732 </File>
725 <File 733 <File
726 RelativePath="..\Include\frameobject.h" 734 RelativePath="..\Include\frameobject.h"
727 > 735 >
977 <File 985 <File
978 RelativePath="..\Modules\_csv.c" 986 RelativePath="..\Modules\_csv.c"
979 > 987 >
980 </File> 988 </File>
981 <File 989 <File
990 RelativePath="..\Modules\_fileio.c"
991 >
992 </File>
993 <File
982 RelativePath="..\Modules\_functoolsmodule.c" 994 RelativePath="..\Modules\_functoolsmodule.c"
983 > 995 >
984 </File> 996 </File>
985 <File 997 <File
986 RelativePath="..\Modules\_heapqmodule.c" 998 RelativePath="..\Modules\_heapqmodule.c"
987 > 999 >
988 </File> 1000 </File>
989 <File 1001 <File
990 RelativePath="..\Modules\_hotshot.c"
991 >
992 </File>
993 <File
994 RelativePath="..\Modules\_localemodule.c" 1002 RelativePath="..\Modules\_localemodule.c"
995 > 1003 >
996 </File> 1004 </File>
997 <File 1005 <File
998 RelativePath="..\Modules\_lsprof.c" 1006 RelativePath="..\Modules\_lsprof.c"
1021 <File 1029 <File
1022 RelativePath="..\Modules\arraymodule.c" 1030 RelativePath="..\Modules\arraymodule.c"
1023 > 1031 >
1024 </File> 1032 </File>
1025 <File 1033 <File
1034 RelativePath="..\Modules\atexitmodule.c"
1035 >
1036 </File>
1037 <File
1026 RelativePath="..\Modules\audioop.c" 1038 RelativePath="..\Modules\audioop.c"
1027 > 1039 >
1028 </File> 1040 </File>
1029 <File 1041 <File
1030 RelativePath="..\Modules\binascii.c" 1042 RelativePath="..\Modules\binascii.c"
1033 <File 1045 <File
1034 RelativePath="..\Modules\cmathmodule.c" 1046 RelativePath="..\Modules\cmathmodule.c"
1035 > 1047 >
1036 </File> 1048 </File>
1037 <File 1049 <File
1038 RelativePath="..\Modules\cPickle.c"
1039 >
1040 </File>
1041 <File
1042 RelativePath="..\Modules\cStringIO.c" 1050 RelativePath="..\Modules\cStringIO.c"
1043 > 1051 >
1044 </File> 1052 </File>
1045 <File 1053 <File
1046 RelativePath="..\Modules\datetimemodule.c" 1054 RelativePath="..\Modules\datetimemodule.c"
1053 <File 1061 <File
1054 RelativePath="..\Modules\gcmodule.c" 1062 RelativePath="..\Modules\gcmodule.c"
1055 > 1063 >
1056 </File> 1064 </File>
1057 <File 1065 <File
1058 RelativePath="..\Modules\imageop.c"
1059 >
1060 </File>
1061 <File
1062 RelativePath="..\Modules\itertoolsmodule.c" 1066 RelativePath="..\Modules\itertoolsmodule.c"
1063 > 1067 >
1064 </File> 1068 </File>
1065 <File 1069 <File
1066 RelativePath="..\Modules\main.c" 1070 RelativePath="..\Modules\main.c"
1069 <File 1073 <File
1070 RelativePath="..\Modules\mathmodule.c" 1074 RelativePath="..\Modules\mathmodule.c"
1071 > 1075 >
1072 </File> 1076 </File>
1073 <File 1077 <File
1074 RelativePath="..\Modules\md5.c"
1075 >
1076 </File>
1077 <File
1078 RelativePath="..\Modules\md5.h"
1079 >
1080 </File>
1081 <File
1082 RelativePath="..\Modules\md5module.c" 1078 RelativePath="..\Modules\md5module.c"
1083 > 1079 >
1084 </File> 1080 </File>
1085 <File 1081 <File
1086 RelativePath="..\Modules\mmapmodule.c" 1082 RelativePath="..\Modules\mmapmodule.c"
1105 <File 1101 <File
1106 RelativePath="..\Modules\rotatingtree.h" 1102 RelativePath="..\Modules\rotatingtree.h"
1107 > 1103 >
1108 </File> 1104 </File>
1109 <File 1105 <File
1106 RelativePath="..\Modules\sha1module.c"
1107 >
1108 </File>
1109 <File
1110 RelativePath="..\Modules\sha256module.c" 1110 RelativePath="..\Modules\sha256module.c"
1111 > 1111 >
1112 </File> 1112 </File>
1113 <File 1113 <File
1114 RelativePath="..\Modules\sha512module.c" 1114 RelativePath="..\Modules\sha512module.c"
1115 > 1115 >
1116 </File> 1116 </File>
1117 <File 1117 <File
1118 RelativePath="..\Modules\shamodule.c"
1119 >
1120 </File>
1121 <File
1122 RelativePath="..\Modules\signalmodule.c" 1118 RelativePath="..\Modules\signalmodule.c"
1123 >
1124 </File>
1125 <File
1126 RelativePath="..\Modules\stropmodule.c"
1127 > 1119 >
1128 </File> 1120 </File>
1129 <File 1121 <File
1130 RelativePath="..\Modules\symtablemodule.c" 1122 RelativePath="..\Modules\symtablemodule.c"
1131 > 1123 >
1337 <File 1329 <File
1338 RelativePath="..\Objects\boolobject.c" 1330 RelativePath="..\Objects\boolobject.c"
1339 > 1331 >
1340 </File> 1332 </File>
1341 <File 1333 <File
1342 RelativePath="..\Objects\bufferobject.c" 1334 RelativePath="..\Objects\bytes_methods.c"
1335 >
1336 </File>
1337 <File
1338 RelativePath="..\Objects\bytesobject.c"
1343 > 1339 >
1344 </File> 1340 </File>
1345 <File 1341 <File
1346 RelativePath="..\Objects\cellobject.c" 1342 RelativePath="..\Objects\cellobject.c"
1347 > 1343 >
1372 </File> 1368 </File>
1373 <File 1369 <File
1374 RelativePath="..\Objects\dictobject.c" 1370 RelativePath="..\Objects\dictobject.c"
1375 > 1371 >
1376 </File> 1372 </File>
1377 <!--File
1378 RelativePath="..\Objects\doubledigits.c"
1379 >
1380 </File-->
1381 <File 1373 <File
1382 RelativePath="..\Objects\enumobject.c" 1374 RelativePath="..\Objects\enumobject.c"
1383 > 1375 >
1384 </File> 1376 </File>
1385 <File 1377 <File
1413 <File 1405 <File
1414 RelativePath="..\Objects\genobject.c" 1406 RelativePath="..\Objects\genobject.c"
1415 > 1407 >
1416 </File> 1408 </File>
1417 <File 1409 <File
1418 RelativePath="..\Objects\intobject.c"
1419 >
1420 </File>
1421 <File
1422 RelativePath="..\Objects\iterobject.c" 1410 RelativePath="..\Objects\iterobject.c"
1423 > 1411 >
1424 </File> 1412 </File>
1425 <File 1413 <File
1426 RelativePath="..\Objects\listobject.c" 1414 RelativePath="..\Objects\listobject.c"
1427 > 1415 >
1428 </File> 1416 </File>
1429 <File 1417 <File
1430 RelativePath="..\Objects\longobject.c" 1418 RelativePath="..\Objects\longobject.c"
1419 >
1420 </File>
1421 <File
1422 RelativePath="..\Objects\memoryobject.c"
1431 > 1423 >
1432 </File> 1424 </File>
1433 <File 1425 <File
1434 RelativePath="..\Objects\methodobject.c" 1426 RelativePath="..\Objects\methodobject.c"
1435 > 1427 >
1630 RelativePath="..\Python\dynload_win.c" 1622 RelativePath="..\Python\dynload_win.c"
1631 > 1623 >
1632 </File> 1624 </File>
1633 <File 1625 <File
1634 RelativePath="..\Python\errors.c" 1626 RelativePath="..\Python\errors.c"
1627 >
1628 </File>
1629 <File
1630 RelativePath="..\Python\formatter_unicode.c"
1635 > 1631 >
1636 </File> 1632 </File>
1637 <File 1633 <File
1638 RelativePath="..\Python\frozen.c" 1634 RelativePath="..\Python\frozen.c"
1639 > 1635 >