Index: branches/azimutz/trunkAutoResolution/i386/libsaio/console.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/console.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/console.c (revision 1055) @@ -263,6 +263,5 @@ void pause() { printf("Press a key to continue...\n"); - getchar(); //getc(); //Azi: getc works here because the function is up above; changed for now. - // replace getchar() by pause() ?? + getchar(); // replace getchar() by pause() ?? were useful...? } Index: branches/azimutz/trunkAutoResolution/i386/libsaio/ext2fs.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/ext2fs.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/ext2fs.c (revision 1055) @@ -37,6 +37,6 @@ return; } str[strMaxLen]=0; - strncpy (str, buf+0x478, min (strMaxLen, 16)); + strncpy (str, buf+0x478, MIN(strMaxLen, 16)); free (buf); } Index: branches/azimutz/trunkAutoResolution/i386/libsaio/spd.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/spd.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/spd.c (revision 1055) @@ -255,7 +255,7 @@ int i, speed; uint8_t spd_size, spd_type; uint32_t base, mmio, hostc; - bool dump = false; +// bool dump = false; RamSlotInfo_t* slot; uint16_t cmd = pci_config_read16(smbus_dev->dev.addr, 0x04); @@ -268,7 +268,8 @@ verbose("Scanning SMBus [%04x:%04x], mmio: 0x%x, ioport: 0x%x, hostc: 0x%x\n", smbus_dev->vendor_id, smbus_dev->device_id, mmio, base, hostc); - getBoolForKey("DumpSPD", &dump, &bootInfo->bootConfig); +//Azi: no use for this! +// getBoolForKey("DumpSPD", &dump, &bootInfo->bootConfig); // needed at least for laptops bool fullBanks = Platform.DMI.MemoryModules == Platform.DMI.CntMemorySlots; Index: branches/azimutz/trunkAutoResolution/i386/libsaio/sys.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/sys.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/sys.c (revision 1055) @@ -451,7 +451,7 @@ if ((iob[i].i_flgs != F_ALLOC) || (i == fdesc)) { continue; } - io->i_buf = max(iob[i].i_filesize + iob[i].i_buf, io->i_buf); + io->i_buf = MAX(iob[i].i_filesize + iob[i].i_buf, io->i_buf); } // Load entire file into memory. Unnecessary open() calls must be avoided. Index: branches/azimutz/trunkAutoResolution/i386/libsaio/load.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/load.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/load.c (revision 1055) @@ -151,8 +151,8 @@ case LC_SEGMENT: ret = DecodeSegment(cmdBase, &load_addr, &load_size); if (ret == 0 && load_size != 0 && load_addr >= KERNEL_ADDR) { - vmaddr = min(vmaddr, load_addr); - vmend = max(vmend, load_addr + load_size); + vmaddr = MIN(vmaddr, load_addr); + vmend = MAX(vmend, load_addr + load_size); } break; Index: branches/azimutz/trunkAutoResolution/i386/libsaio/cpu.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/cpu.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/cpu.c (revision 1055) @@ -56,7 +56,7 @@ */ if((tscEnd - tscStart) <= CALIBRATE_TIME_MSEC) continue; - // tscDelta = min(tscDelta, (tscEnd - tscStart)) + // tscDelta = MIN(tscDelta, (tscEnd - tscStart)) if( (tscEnd - tscStart) < tscDelta ) tscDelta = tscEnd - tscStart; } @@ -170,7 +170,7 @@ strlcpy(p->CPU.BrandString, s, sizeof(p->CPU.BrandString)); - if (!strncmp(p->CPU.BrandString, CPU_STRING_UNKNOWN, min(sizeof(p->CPU.BrandString), strlen(CPU_STRING_UNKNOWN) + 1))) { + if (!strncmp(p->CPU.BrandString, CPU_STRING_UNKNOWN, MIN(sizeof(p->CPU.BrandString), strlen(CPU_STRING_UNKNOWN) + 1))) { /* * This string means we have a firmware-programmable brand string, * and the firmware couldn't figure out what sort of CPU we have. Index: branches/azimutz/trunkAutoResolution/i386/libsaio/disk.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/disk.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/disk.c (revision 1055) @@ -1766,7 +1766,7 @@ if ( matchVolumeToString(bvr, volStart, volLen) ) { - strncat(str, aliasStart, min(strMaxLen, aliasLen)); + strncat(str, aliasStart, MIN(strMaxLen, aliasLen)); free(aliasList); return true; Index: branches/azimutz/trunkAutoResolution/i386/libsaio/biosfn.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/biosfn.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/biosfn.c (revision 1055) @@ -509,7 +509,7 @@ printf("media_type: %x\n", pkt.media_type); printf("drive_num: %x\n", pkt.drive_num); printf("device_spec: %x\n", pkt.device_spec); - printf("press a key->\n"); getchar(); + pause(); #endif /* Some BIOSes erroneously return cf = 1 */ Index: branches/azimutz/trunkAutoResolution/i386/libsaio/saio_types.h =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/saio_types.h (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/saio_types.h (revision 1055) @@ -233,18 +233,23 @@ DEV_EN = 3 }; -#ifndef max -#define max(a,b) ((a) > (b) ? (a) : (b)) +/* + * min/max Macros. + * + * Azi: defined on , i386/include/IOKit/IOLib.h (min/max, lower case), and others... + */ +#ifndef MIN +#define MIN(a,b) ( ((a) < (b)) ? (a) : (b) ) #endif - -#ifndef min -#define min(a,b) ((a) < (b) ? (a) : (b)) +#ifndef MAX +#define MAX(a,b) ( ((a) > (b)) ? (a) : (b) ) #endif +/*Azi: not used #define round2(x, m) (((x) + (m / 2)) & ~(m - 1)) #define roundup2(x, m) (((x) + m - 1) & ~(m - 1)) -#define MAKEKERNDEV(t, u, p) MAKEBOOTDEV(t, 0, 0, u, p) +#define MAKEKERNDEV(t, u, p) MAKEBOOTDEV(t, 0, 0, u, p)*/ enum { kNetworkDeviceType = kBIOSDevTypeNetwork, Index: branches/azimutz/trunkAutoResolution/i386/libsaio/msdos.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/msdos.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/msdos.c (revision 1055) @@ -45,10 +45,9 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define tolower(c) (((c)>='A' && c<='Z')?((c) | 0x20):(c)) + #include "libsaio.h" #include "sl.h" - #include "msdos_private.h" #include "msdos.h" @@ -60,6 +59,8 @@ #define CLUST_RSRVD16 0xfff8 /* reserved cluster range */ #define CLUST_RSRVD12 0xff8 /* reserved cluster range */ +#define tolower(c) (((c)>='A' && c<='Z')?((c) | 0x20):(c)) + static int msdosressector=0; static int msdosnfats = 0; static int msdosfatsecs = 0; @@ -767,10 +768,10 @@ if (length==0 || length>size-offset) toread=size-offset; wastoread=toread; - bcopy (buf+(offset%msdosclustersize),ptr,min(msdosclustersize-(offset%msdosclustersize), toread)); + bcopy (buf+(offset%msdosclustersize),ptr,MIN(msdosclustersize-(offset%msdosclustersize), toread)); ptr+=msdosclustersize-(offset%msdosclustersize); toread-=msdosclustersize-(offset%msdosclustersize); - while (toread>0 && msdosreadcluster (ih, (uint8_t *)ptr, min(msdosclustersize,toread), &cluster)) + while (toread>0 && msdosreadcluster (ih, (uint8_t *)ptr, MIN(msdosclustersize,toread), &cluster)) { ptr+=msdosclustersize; toread-=msdosclustersize; Index: branches/azimutz/trunkAutoResolution/i386/boot0/chain0.s =================================================================== --- branches/azimutz/trunkAutoResolution/i386/boot0/chain0.s (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/boot0/chain0.s (revision 1055) @@ -697,4 +697,4 @@ times 510-($-$$) db 0 dw kBootSignature -;END +; END Index: branches/azimutz/trunkAutoResolution/i386/boot0/boot0.s =================================================================== --- branches/azimutz/trunkAutoResolution/i386/boot0/boot0.s (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/boot0/boot0.s (revision 1055) @@ -317,33 +317,33 @@ .Pass1: %if CONFIG_BOOT0_HFSFIRST cmp BYTE [si + part.type], kPartTypeHFS ; In pass 1 we're going to find a HFS+ partition - ; equipped with boot1h in its boot record - ; regardless if it's active or not. + ; equipped with boot1h in its boot record + ; regardless if it's active or not. jne .continue - mov dh, 1 ; Argument for loadBootSector to check HFS+ partition signature. + mov dh, 1 ; Argument for loadBootSector to check HFS+ partition signature. %else cmp BYTE [si + part.bootid], kPartActive ; In pass 1 we are walking on the standard path - ; by trying to hop on the active partition. + ; by trying to hop on the active partition. jne .continue - xor dh, dh ; Argument for loadBootSector to skip HFS+ partition - ; signature check. + xor dh, dh ; Argument for loadBootSector to skip HFS+ partition + ; signature check. %endif - jmp .tryToBoot + jmp .tryToBoot .Pass2: %if CONFIG_BOOT0_HFSFIRST cmp BYTE [si + part.bootid], kPartActive ; In pass 2 we are walking on the standard path - ; by trying to hop on the active partition. + ; by trying to hop on the active partition. jne .continue - xor dh, dh ; Argument for loadBootSector to skip HFS+ partition - ; signature check. + xor dh, dh ; Argument for loadBootSector to skip HFS+ partition + ; signature check. %else cmp BYTE [si + part.type], kPartTypeHFS ; In pass 2 we're going to find a HFS+ partition - ; equipped with boot1h in its boot record - ; regardless if it's active or not. + ; equipped with boot1h in its boot record + ; regardless if it's active or not. jne .continue - mov dh, 1 ; Argument for loadBootSector to check HFS+ partition signature. + mov dh, 1 ; Argument for loadBootSector to check HFS+ partition signature. %endif DebugChar('*') @@ -359,7 +359,7 @@ jmp SHORT initBootLoader .continue: - add si, BYTE part_size ; advance SI to next partition entry + add si, BYTE part_size ; advance SI to next partition entry loop .loop ; loop through all partition entries ; @@ -369,7 +369,7 @@ ; dec bl jnz .switchPass2 ; didn't find Protective MBR before - call checkGPT + call checkGPT .switchPass2: ; @@ -406,7 +406,7 @@ ; checkGPT: push bx - + mov di, kLBA1Buffer ; address of GUID Partition Table Header cmp DWORD [di], kGPTSignatureLow ; looking for 'EFI ' jne .exit ; not found. Giving up. @@ -496,8 +496,8 @@ .exit: pop bx ret ; no more GUID partitions. Giving up. - + ;-------------------------------------------------------------------------- ; loadBootSector - Load boot sector ; Index: branches/azimutz/trunkAutoResolution/i386/boot2/graphics.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/boot2/graphics.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/boot2/graphics.c (revision 1055) @@ -44,8 +44,6 @@ uint8_t *previewSaveunder = 0; #define VIDEO(x) (bootArgs->Video.v_ ## x) - -#define MIN(x, y) ((x) < (y) ? (x) : (y)) //========================================================================== // getVBEInfoString Index: branches/azimutz/trunkAutoResolution/i386/boot2/drivers.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/boot2/drivers.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/boot2/drivers.c (revision 1055) @@ -182,74 +182,64 @@ } } else if ( gBootFileType == kBlockDeviceType ) - { - if (!gHaveKernelCache) - { - // Non-prelinked kernel, load system mkext. - // NOTE: In it's default state, XNU cannot be both prelinked, and load additional drivers - // from the bootloader. There is, however, a patch that changes this and allows - // for both to occure. - - // Also try to load Extensions from boot helper partitions. - if (gBootVolume->flags & kBVFlagBooter) - { - strcpy(dirSpecExtra, "/com.apple.boot.P/System/Library/"); - if (FileLoadDrivers(dirSpecExtra, 0) != 0) - { - strcpy(dirSpecExtra, "/com.apple.boot.R/System/Library/"); - if (FileLoadDrivers(dirSpecExtra, 0) != 0) - { - strcpy(dirSpecExtra, "/com.apple.boot.S/System/Library/"); - FileLoadDrivers(dirSpecExtra, 0); - } - } - } - - if (gMKextName[0] != '\0') - { - verbose("LoadDrivers: Loading from [%s]\n", gMKextName); - if ( LoadDriverMKext(gMKextName) != 0 ) - { - error("Could not load %s\n", gMKextName); - return -1; - } - } - else - { - strcpy(gExtensionsSpec, dirSpec); - strcat(gExtensionsSpec, "System/Library/"); - FileLoadDrivers(gExtensionsSpec, 0); - } - - } - - //Azi: dependencies still need to be added to E/E.mkext!! + { // First try to load Extra extensions from the ramdisk if isn't aliased as bt(0,0). if (gRAMDiskVolume && !gRAMDiskBTAliased) { - strcpy(dirSpecExtra, "rd(0,0)/Extra/"); - FileLoadDrivers(dirSpecExtra, 0); + strcpy(dirSpecExtra, "rd(0,0)/Extra/"); + FileLoadDrivers(dirSpecExtra, 0); } - + // Next try to load Extra extensions from the selected root partition. strcpy(dirSpecExtra, "/Extra/"); if (FileLoadDrivers(dirSpecExtra, 0) != 0) { // If failed, then try to load Extra extensions from the boot partition - // in case we have a separate booter partition or a bt(0,0) aliased ramdisk. - if ( !(gBIOSBootVolume->biosdev == gBootVolume->biosdev && gBIOSBootVolume->part_no == gBootVolume->part_no) - || (gRAMDiskVolume && gRAMDiskBTAliased) ) - { - // Next try a specfic OS version folder ie 10.5 + // in case we have a separate booter partition or a bt(0,0) aliased ramdisk. + if ( !(gBIOSBootVolume->biosdev == gBootVolume->biosdev && gBIOSBootVolume->part_no == gBootVolume->part_no) + || (gRAMDiskVolume && gRAMDiskBTAliased) ) + { + // Next try a specfic OS version folder ie 10.5 sprintf(dirSpecExtra, "bt(0,0)/Extra/%s/", &gMacOSVersion); + if (FileLoadDrivers(dirSpecExtra, 0) != 0) + { + // Next we'll try the base + strcpy(dirSpecExtra, "bt(0,0)/Extra/"); + FileLoadDrivers(dirSpecExtra, 0); + } + } + } + + // Also try to load Extensions from boot helper partitions. + if (gBootVolume->flags & kBVFlagBooter) + { + strcpy(dirSpecExtra, "/com.apple.boot.P/System/Library/"); + if (FileLoadDrivers(dirSpecExtra, 0) != 0) + { + strcpy(dirSpecExtra, "/com.apple.boot.R/System/Library/"); if (FileLoadDrivers(dirSpecExtra, 0) != 0) { - // Next we'll try the base - strcpy(dirSpecExtra, "bt(0,0)/Extra/"); + strcpy(dirSpecExtra, "/com.apple.boot.S/System/Library/"); FileLoadDrivers(dirSpecExtra, 0); } } } + + if (gMKextName[0] != '\0') + { + verbose("LoadDrivers: Loading from [%s]\n", gMKextName); + if ( LoadDriverMKext(gMKextName) != 0 ) + { + error("Could not load %s\n", gMKextName); + return -1; + } + } + else + { + strcpy(gExtensionsSpec, dirSpec); + strcat(gExtensionsSpec, "System/Library/"); + FileLoadDrivers(gExtensionsSpec, 0); + } } else { Index: branches/azimutz/trunkAutoResolution/i386/boot2/boot.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/boot2/boot.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/boot2/boot.c (revision 1055) @@ -157,7 +157,8 @@ execute_hook("DecodedKernel", (void*)binary, NULL, NULL, NULL); // Load boot drivers from the specifed root path. - LoadDrivers("/"); + if (!gHaveKernelCache) + LoadDrivers("/"); clearActivityIndicator(); @@ -577,7 +578,7 @@ break; } - if(getBoolForKey(kUseKernelCache, &usecache, &bootInfo->bootConfig) && usecache) { + if(getBoolForKey(kUseKernelCache, &usecache, &bootInfo->bootConfig)) { if (getValueForKey(kKernelCacheKey, &val, &len, &bootInfo->bootConfig)) { strlcpy(gBootKernelCacheFile, val, len+1); } Index: branches/azimutz/trunkAutoResolution/i386/boot2/gui.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/boot2/gui.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/boot2/gui.c (revision 1055) @@ -23,18 +23,13 @@ #define LOADPNG(img, alt_img) if (loadThemeImage(#img, alt_img) != 0) { return 1; } -#define MIN(x, y) ((x) < (y) ? (x) : (y)) -#define MAX(x, y) ((x) > (y) ? (x) : (y)) - #define VIDEO(x) (bootArgs->Video.v_ ## x) #define vram VIDEO(baseAddr) int lasttime = 0; // we need this for animating maybe -extern int gDeviceCount; - /* * ATTENTION: the enum and the following array images[] MUST match !!! */ Index: branches/azimutz/trunkAutoResolution/i386/boot2/options.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/boot2/options.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/boot2/options.c (revision 1055) @@ -324,11 +324,11 @@ gMenuHeight = height; gMenuItemCount = count; gMenuTop = 0; - gMenuBottom = min( count, height ) - 1; + gMenuBottom = MIN( count, height ) - 1; gMenuSelection = selection; gMenuStart = 0; - gMenuEnd = min( count, gui.maxdevices ) - 1; + gMenuEnd = MIN( count, gui.maxdevices ) - 1; // If the selected item is not visible, shift the list down. @@ -901,7 +901,7 @@ printf("Use \30\31 keys to select the startup volume."); } showMenu( menuItems, gDeviceCount, selectIndex, kMenuTopRow + 2, kMenuMaxItems ); - nextRow += min( gDeviceCount, kMenuMaxItems ) + 3; + nextRow += MIN( gDeviceCount, kMenuMaxItems ) + 3; } // Show the boot prompt. @@ -1112,7 +1112,7 @@ if (gDeviceCount) { printf("Use \30\31 keys to select the startup volume."); showMenu(menuItems, gDeviceCount, selectIndex, kMenuTopRow + 2, kMenuMaxItems); - nextRow += min(gDeviceCount, kMenuMaxItems) + 3; + nextRow += MIN(gDeviceCount, kMenuMaxItems) + 3; } showPrompt = (gDeviceCount == 0) || (menuBVR->flags & kBVFlagNativeBoot); Index: branches/azimutz/trunkAutoResolution/i386/libsa/prf.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsa/prf.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsa/prf.c (revision 1055) @@ -93,7 +93,7 @@ void prf( char *fmt, unsigned int *adx, - int (*putfn_p)(), + int (*putfn_p)(), void *putfn_arg ) { Index: branches/azimutz/trunkAutoResolution/i386/libsa/qsort.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsa/qsort.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsa/qsort.c (revision 1055) @@ -57,12 +57,11 @@ #include #include +#include "saio_types.h" //Azi: MIN/MAX static inline char *med3 __P((char *, char *, char *, int (*)())); static inline void swapfunc __P((char *, char *, int, int)); -#define min(a, b) (a) < (b) ? a : b - /* * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function". */ @@ -178,9 +177,9 @@ } pn = a + n * es; - r = min(pa - (char *)a, pb - pa); + r = MIN(pa - (char *)a, pb - pa); vecswap(a, pb - r, r); - r = min(pd - pc, (pn - pd) - (int)es); + r = MIN(pd - pc, (pn - pd) - (int)es); vecswap(pb, pn - r, r); if ((r = pb - pa) > (int)es) qsort(a, r / es, es, cmp); Index: branches/azimutz/trunkAutoResolution/i386/libsa/memory.h =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsa/memory.h (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/libsa/memory.h (revision 1055) @@ -48,21 +48,21 @@ # define BASE_SEG BOOT2_SEG #endif -#define STACK_SEG 0x1000 // zef: old STACK_SEG 0x5000 -#define STACK_OFS 0xFFF0 // stack pointer +#define STACK_SEG 0x1000 // zef: old STACK_SEG 0x5000 +#define STACK_OFS 0xFFF0 // stack pointer -#define BOOT1U_SEG 0x1000 -#define BOOT1U_OFS 0x0200 +#define BOOT1U_SEG 0x1000 +#define BOOT1U_OFS 0x0200 -#define BOOT2_SEG 0x2000 -#define BOOT2_OFS 0x0200 // 512 byte disk sector offset +#define BOOT2_SEG 0x2000 +#define BOOT2_OFS 0x0200 // 512 byte disk sector offset -#define BOOT2_MAX_LENGTH 0x6FE00 // Maximum size for boot2 is currentl 447kb +#define BOOT2_MAX_LENGTH 0x6FE00 // Maximum size for boot2 is currentl 447kb -#define BIOS_ADDR 0x8000 // BIOS disk I/O buffer -#define BIOS_LEN 0x8000 // 32K - divisible by 512 and 2048 +#define BIOS_ADDR 0x8000 // BIOS disk I/O buffer +#define BIOS_LEN 0x8000 // 32K - divisible by 512 and 2048 -#define BOOT0_ADDR 0x7E00 // boot0 gets loaded here +#define BOOT0_ADDR 0x7E00 // boot0 gets loaded here /* These are all "virtual" addresses... Index: branches/azimutz/trunkAutoResolution/i386/util/fdisk/cmd.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/util/fdisk/cmd.c (revision 1054) +++ branches/azimutz/trunkAutoResolution/i386/util/fdisk/cmd.c (revision 1055) @@ -65,6 +65,7 @@ #include "part.h" #include "cmd.h" #include "auto.h" + #define MAX(a, b) ((a) >= (b) ? (a) : (b)) int Property changes on: branches/azimutz/trunkAutoResolution ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r1039-1054