fpc/tests/webtbf
Jonas Maebe b40797e7f8 --- Merging r39844 into '.':
U    utils/fpcmkcfg/fpcmkcfg.pp
U    utils/fpcmkcfg/fpccfg.inc
U    utils/fpcmkcfg/fpc.cft
--- Recording mergeinfo for merge of r39844 into '.':
 U   .
--- Merging r39949 into '.':
U    compiler/ncnv.pas
U    compiler/avr/cgcpu.pas
U    compiler/symconst.pas
U    compiler/defutil.pas
U    compiler/nadd.pas
U    compiler/ncgrtti.pas
U    compiler/llvm/llvmdef.pas
U    compiler/llvm/hlcgllvm.pas
U    compiler/dbgstabs.pas
U    compiler/ppcgen/cgppc.pas
U    compiler/ppcgen/ngppcadd.pas
U    compiler/psystem.pas
U    compiler/jvm/jvmdef.pas
U    compiler/jvm/njvminl.pas
U    compiler/jvm/njvmcnv.pas
U    compiler/jvm/hlcgcpu.pas
U    compiler/dbgdwarf.pas
U    compiler/sparcgen/cgsparc.pas
U    compiler/nmat.pas
U    compiler/nset.pas
U    compiler/symdef.pas
U    compiler/ngtcon.pas
U    compiler/scanner.pas
U    compiler/i8086/n8086add.pas
U    compiler/arm/narmadd.pas
U    compiler/arm/cgcpu.pas
U    compiler/ninl.pas
U    compiler/ptype.pas
U    compiler/nflw.pas
U    compiler/defcmp.pas
U    compiler/x86/cgx86.pas
U    compiler/x86_64/cpupara.pas
U    compiler/utils/ppuutils/ppudump.pp
U    compiler/htypechk.pas
U    compiler/pdecvar.pas
U    compiler/ncal.pas
U    compiler/m68k/cgcpu.pas
U    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r39949 into '.':
 G   .
--- Merging r39950 into '.':
U    rtl/inc/objcbase.pp
U    rtl/inc/objcnf.inc
U    rtl/inc/objc1.inc
U    packages/cocoaint/src/CocoaAll.pas
U    packages/cocoaint/src/quartzcore/CIPlugIn.inc
U    packages/cocoaint/src/quartzcore/CAEmitterLayer.inc
U    packages/cocoaint/src/quartzcore/CAAnimation.inc
U    packages/cocoaint/src/quartzcore/CAOpenGLLayer.inc
U    packages/cocoaint/src/quartzcore/CAMediaTiming.inc
U    packages/cocoaint/src/quartzcore/CIImage.inc
U    packages/cocoaint/src/quartzcore/CIFilterGenerator.inc
U    packages/cocoaint/src/quartzcore/CAEmitterCell.inc
U    packages/cocoaint/src/quartzcore/CALayer.inc
U    packages/cocoaint/src/quartzcore/CIFilterShape.inc
U    packages/cocoaint/src/quartzcore/CATextLayer.inc
U    packages/cocoaint/src/quartzcore/CATransaction.inc
U    packages/cocoaint/src/quartzcore/CIPlugInInterface.inc
U    packages/cocoaint/src/quartzcore/CACIFilterAdditions.inc
U    packages/cocoaint/src/quartzcore/CAReplicatorLayer.inc
U    packages/cocoaint/src/foundation/NSURL.inc
U    packages/cocoaint/src/foundation/NSDictionary.inc
U    packages/cocoaint/src/foundation/NSObject.inc
U    packages/cocoaint/src/foundation/NSSpellServer.inc
U    packages/cocoaint/src/foundation/NSString.inc
U    packages/cocoaint/src/foundation/NSCalendar.inc
U    packages/cocoaint/src/foundation/NSURLRequest.inc
U    packages/cocoaint/src/foundation/NSZone.inc
U    packages/cocoaint/src/foundation/NSURLHandle.inc
U    packages/cocoaint/src/foundation/NSPropertyList.inc
U    packages/cocoaint/src/foundation/NSTimer.inc
U    packages/cocoaint/src/foundation/NSIndexSet.inc
U    packages/cocoaint/src/foundation/NSPathUtilities.inc
U    packages/cocoaint/src/foundation/NSDistributedNotificationCenter.inc
U    packages/cocoaint/src/foundation/NSSet.inc
U    packages/cocoaint/src/foundation/NSAppleEventManager.inc
U    packages/cocoaint/src/foundation/NSRunLoop.inc
U    packages/cocoaint/src/foundation/NSScriptClassDescription.inc
U    packages/cocoaint/src/foundation/NSOperation.inc
U    packages/cocoaint/src/foundation/NSUndoManager.inc
U    packages/cocoaint/src/foundation/NSMethodSignature.inc
U    packages/cocoaint/src/foundation/NSArchiver.inc
U    packages/cocoaint/src/foundation/NSUserDefaults.inc
U    packages/cocoaint/src/foundation/NSXMLNode.inc
U    packages/cocoaint/src/foundation/NSScriptCommandDescription.inc
U    packages/cocoaint/src/foundation/NSScriptObjectSpecifiers.inc
U    packages/cocoaint/src/foundation/NSInvocation.inc
U    packages/cocoaint/src/foundation/NSXMLParser.inc
U    packages/cocoaint/src/foundation/NSArray.inc
U    packages/cocoaint/src/foundation/NSMetadata.inc
U    packages/cocoaint/src/foundation/NSMapTable.inc
U    packages/cocoaint/src/foundation/NSURLDownload.inc
U    packages/cocoaint/src/foundation/NSHashTable.inc
U    packages/cocoaint/src/foundation/NSXMLDTD.inc
U    packages/cocoaint/src/foundation/NSURLCredential.inc
U    packages/cocoaint/src/foundation/NSValueTransformer.inc
U    packages/cocoaint/src/foundation/NSPredicate.inc
U    packages/cocoaint/src/foundation/NSPortCoder.inc
U    packages/cocoaint/src/foundation/NSXMLDTDNode.inc
U    packages/cocoaint/src/foundation/NSAppleEventDescriptor.inc
U    packages/cocoaint/src/foundation/NSScriptCommand.inc
U    packages/cocoaint/src/foundation/NSCache.inc
U    packages/cocoaint/src/foundation/NSKeyValueObserving.inc
U    packages/cocoaint/src/foundation/NSDecimalNumber.inc
U    packages/cocoaint/src/foundation/NSScriptSuiteRegistry.inc
U    packages/cocoaint/src/foundation/NSKeyValueCoding.inc
U    packages/cocoaint/src/foundation/NSBundle.inc
U    packages/cocoaint/src/foundation/NSPointerFunctions.inc
U    packages/cocoaint/src/foundation/NSXMLElement.inc
U    packages/cocoaint/src/foundation/NSValue.inc
U    packages/cocoaint/src/foundation/NSPort.inc
U    packages/cocoaint/src/foundation/NSAppleScript.inc
U    packages/cocoaint/src/foundation/NSSortDescriptor.inc
U    packages/cocoaint/src/foundation/NSLock.inc
U    packages/cocoaint/src/foundation/NSScanner.inc
U    packages/cocoaint/src/foundation/NSStream.inc
U    packages/cocoaint/src/foundation/NSGeometry.inc
U    packages/cocoaint/src/foundation/NSScriptWhoseTests.inc
U    packages/cocoaint/src/foundation/NSXMLDocument.inc
U    packages/cocoaint/src/foundation/NSConnection.inc
U    packages/cocoaint/src/foundation/NSDateFormatter.inc
U    packages/cocoaint/src/foundation/NSTask.inc
U    packages/cocoaint/src/foundation/NSFormatter.inc
U    packages/cocoaint/src/foundation/NSThread.inc
U    packages/cocoaint/src/foundation/NSCharacterSet.inc
U    packages/cocoaint/src/foundation/NSData.inc
U    packages/cocoaint/src/foundation/NSHTTPCookie.inc
U    packages/cocoaint/src/foundation/NSFileManager.inc
U    packages/cocoaint/src/foundation/NSPortNameServer.inc
U    packages/cocoaint/src/foundation/NSNumberFormatter.inc
U    packages/cocoaint/src/foundation/NSDate.inc
U    packages/cocoaint/src/foundation/NSHost.inc
U    packages/cocoaint/src/foundation/NSProxy.inc
U    packages/cocoaint/src/foundation/NSURLConnection.inc
U    packages/cocoaint/src/foundation/NSURLProtocol.inc
U    packages/cocoaint/src/foundation/NSURLProtectionSpace.inc
U    packages/cocoaint/src/foundation/NSKeyedArchiver.inc
U    packages/cocoaint/src/foundation/NSPortMessage.inc
U    packages/cocoaint/src/foundation/NSError.inc
U    packages/cocoaint/src/foundation/NSNetServices.inc
U    packages/cocoaint/src/foundation/NSTimeZone.inc
U    packages/cocoaint/src/foundation/NSFileHandle.inc
U    packages/cocoaint/src/foundation/NSDistributedLock.inc
U    packages/cocoaint/src/foundation/NSCoder.inc
U    packages/cocoaint/src/foundation/NSGarbageCollector.inc
U    packages/cocoaint/src/InlineFunctions.inc
U    packages/cocoaint/src/coredata/NSPersistentStore.inc
U    packages/cocoaint/src/coredata/NSEntityDescription.inc
U    packages/cocoaint/src/coredata/NSPersistentStoreCoordinator.inc
U    packages/cocoaint/src/coredata/NSFetchRequestExpression.inc
U    packages/cocoaint/src/coredata/NSManagedObject.inc
U    packages/cocoaint/src/coredata/NSMigrationManager.inc
U    packages/cocoaint/src/coredata/NSPropertyDescription.inc
U    packages/cocoaint/src/coredata/NSManagedObjectContext.inc
U    packages/cocoaint/src/coredata/NSAtomicStore.inc
U    packages/cocoaint/src/coredata/NSManagedObjectID.inc
U    packages/cocoaint/src/coredata/NSFetchRequest.inc
U    packages/cocoaint/src/coredata/NSManagedObjectModel.inc
U    packages/cocoaint/src/coredata/NSRelationshipDescription.inc
U    packages/cocoaint/src/coredata/NSEntityMigrationPolicy.inc
U    packages/cocoaint/src/webkit/DOMEventTarget.inc
U    packages/cocoaint/src/webkit/DOMMouseEvent.inc
U    packages/cocoaint/src/webkit/DOMHTMLStyleElement.inc
U    packages/cocoaint/src/webkit/DOMWheelEvent.inc
U    packages/cocoaint/src/webkit/WebUIDelegate.inc
U    packages/cocoaint/src/webkit/WebView.inc
U    packages/cocoaint/src/webkit/DOMAttr.inc
U    packages/cocoaint/src/webkit/WebDocument.inc
U    packages/cocoaint/src/webkit/DOMNode.inc
U    packages/cocoaint/src/webkit/DOMStyleSheet.inc
U    packages/cocoaint/src/webkit/DOMHTMLLinkElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLDocument.inc
U    packages/cocoaint/src/webkit/DOMHTMLMenuElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLAreaElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLHRElement.inc
U    packages/cocoaint/src/webkit/DOMEvent.inc
U    packages/cocoaint/src/webkit/WebFrameView.inc
U    packages/cocoaint/src/webkit/DOMXPathResult.inc
U    packages/cocoaint/src/webkit/DOMHTMLInputElement.inc
U    packages/cocoaint/src/webkit/DOMDocument.inc
U    packages/cocoaint/src/webkit/DOMHTMLOptGroupElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLImageElement.inc
U    packages/cocoaint/src/webkit/DOMMutationEvent.inc
U    packages/cocoaint/src/webkit/WebEditingDelegate.inc
U    packages/cocoaint/src/webkit/WebBackForwardList.inc
U    packages/cocoaint/src/webkit/DOMHTMLTableCellElement.inc
U    packages/cocoaint/src/webkit/WebScriptObject.inc
U    packages/cocoaint/src/webkit/DOMHTMLFrameElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLOListElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLScriptElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLObjectElement.inc
U    packages/cocoaint/src/webkit/DOMCSSStyleDeclaration.inc
U    packages/cocoaint/src/webkit/DOMElement.inc
U    packages/cocoaint/src/webkit/DOMRange.inc
U    packages/cocoaint/src/webkit/DOMNodeIterator.inc
U    packages/cocoaint/src/webkit/DOMKeyboardEvent.inc
U    packages/cocoaint/src/webkit/DOMTreeWalker.inc
U    packages/cocoaint/src/webkit/DOMHTMLOptionElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLSelectElement.inc
U    packages/cocoaint/src/webkit/WebPlugin.inc
U    packages/cocoaint/src/webkit/DOMHTMLUListElement.inc
U    packages/cocoaint/src/webkit/WebHistory.inc
U    packages/cocoaint/src/webkit/WebPreferences.inc
U    packages/cocoaint/src/webkit/DOMHTMLDListElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLElement.inc
U    packages/cocoaint/src/webkit/DOMImplementation.inc
U    packages/cocoaint/src/webkit/DOMHTMLPreElement.inc
U    packages/cocoaint/src/webkit/WebDataSource.inc
U    packages/cocoaint/src/webkit/DOMHTMLDirectoryElement.inc
U    packages/cocoaint/src/webkit/DOMOverflowEvent.inc
U    packages/cocoaint/src/webkit/DOMProgressEvent.inc
U    packages/cocoaint/src/webkit/DOMHTMLButtonElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLTextAreaElement.inc
U    packages/cocoaint/src/webkit/DOMUIEvent.inc
U    packages/cocoaint/src/Foundation.pas
U    packages/cocoaint/src/appkit/NSPrinter.inc
U    packages/cocoaint/src/appkit/NSColorPicking.inc
U    packages/cocoaint/src/appkit/NSHelpManager.inc
U    packages/cocoaint/src/appkit/NSRulerView.inc
U    packages/cocoaint/src/appkit/NSCollectionView.inc
U    packages/cocoaint/src/appkit/NSBox.inc
U    packages/cocoaint/src/appkit/NSPathCell.inc
U    packages/cocoaint/src/appkit/NSPathControl.inc
U    packages/cocoaint/src/appkit/NSWorkspace.inc
U    packages/cocoaint/src/appkit/NSMenuView.inc
U    packages/cocoaint/src/appkit/NSUserInterfaceItemSearching.inc
U    packages/cocoaint/src/appkit/NSWindow.inc
U    packages/cocoaint/src/appkit/NSDictionaryController.inc
U    packages/cocoaint/src/appkit/NSView.inc
U    packages/cocoaint/src/appkit/NSButtonCell.inc
U    packages/cocoaint/src/appkit/NSDocument.inc
U    packages/cocoaint/src/appkit/NSAnimation.inc
U    packages/cocoaint/src/appkit/NSSpeechSynthesizer.inc
U    packages/cocoaint/src/appkit/NSStepperCell.inc
U    packages/cocoaint/src/appkit/NSQuickDrawView.inc
U    packages/cocoaint/src/appkit/NSSplitView.inc
U    packages/cocoaint/src/appkit/NSScrollView.inc
U    packages/cocoaint/src/appkit/NSImageRep.inc
U    packages/cocoaint/src/appkit/NSRulerMarker.inc
U    packages/cocoaint/src/appkit/NSPersistentDocument.inc
U    packages/cocoaint/src/appkit/NSPanel.inc
U    packages/cocoaint/src/appkit/NSSpeechRecognizer.inc
U    packages/cocoaint/src/appkit/NSProgressIndicator.inc
U    packages/cocoaint/src/appkit/NSColorWell.inc
U    packages/cocoaint/src/appkit/NSAlert.inc
U    packages/cocoaint/src/appkit/NSPrintInfo.inc
U    packages/cocoaint/src/appkit/NSNib.inc
U    packages/cocoaint/src/appkit/NSMovieView.inc
U    packages/cocoaint/src/appkit/NSUserInterfaceValidation.inc
U    packages/cocoaint/src/appkit/NSButton.inc
U    packages/cocoaint/src/appkit/NSSavePanel.inc
U    packages/cocoaint/src/appkit/NSColor.inc
U    packages/cocoaint/src/appkit/NSViewController.inc
U    packages/cocoaint/src/appkit/NSCell.inc
U    packages/cocoaint/src/appkit/NSArrayController.inc
U    packages/cocoaint/src/appkit/NSDocumentController.inc
U    packages/cocoaint/src/appkit/NSTokenField.inc
U    packages/cocoaint/src/appkit/NSTextField.inc
U    packages/cocoaint/src/appkit/NSDockTile.inc
U    packages/cocoaint/src/appkit/NSAttributedString.inc
U    packages/cocoaint/src/appkit/NSSecureTextField.inc
U    packages/cocoaint/src/appkit/NSFontManager.inc
U    packages/cocoaint/src/appkit/NSMatrix.inc
U    packages/cocoaint/src/appkit/NSNibLoading.inc
U    packages/cocoaint/src/appkit/NSStatusBar.inc
U    packages/cocoaint/src/appkit/NSComboBoxCell.inc
U    packages/cocoaint/src/appkit/NSObjectController.inc
U    packages/cocoaint/src/appkit/NSControl.inc
U    packages/cocoaint/src/appkit/NSClipView.inc
U    packages/cocoaint/src/appkit/NSSlider.inc
U    packages/cocoaint/src/appkit/NSScroller.inc
U    packages/cocoaint/src/appkit/NSAccessibility.inc
U    packages/cocoaint/src/appkit/NSSound.inc
U    packages/cocoaint/src/appkit/NSWindowScripting.inc
U    packages/cocoaint/src/appkit/NSTextAttachment.inc
U    packages/cocoaint/src/appkit/NSColorPanel.inc
U    packages/cocoaint/src/appkit/NSTreeController.inc
U    packages/cocoaint/src/appkit/NSTableColumn.inc
U    packages/cocoaint/src/appkit/NSUserDefaultsController.inc
U    packages/cocoaint/src/appkit/NSWindowController.inc
U    packages/cocoaint/src/appkit/NSSegmentedControl.inc
U    packages/cocoaint/src/appkit/NSRuleEditor.inc
U    packages/cocoaint/src/appkit/NSMovie.inc
U    packages/cocoaint/src/appkit/NSFileWrapper.inc
U    packages/cocoaint/src/appkit/NSTabViewItem.inc
U    packages/cocoaint/src/appkit/NSEvent.inc
U    packages/cocoaint/src/appkit/NSTouch.inc
U    packages/cocoaint/src/appkit/NSBrowserCell.inc
U    packages/cocoaint/src/appkit/NSPasteboard.inc
U    packages/cocoaint/src/appkit/NSTextContainer.inc
U    packages/cocoaint/src/appkit/NSTextTable.inc
U    packages/cocoaint/src/appkit/NSStatusItem.inc
U    packages/cocoaint/src/appkit/NSPasteboardItem.inc
U    packages/cocoaint/src/appkit/NSFormCell.inc
U    packages/cocoaint/src/appkit/NSSpellChecker.inc
U    packages/cocoaint/src/appkit/NSTreeNode.inc
U    packages/cocoaint/src/appkit/NSLayoutManager.inc
U    packages/cocoaint/src/appkit/NSTypesetter.inc
U    packages/cocoaint/src/appkit/NSSearchFieldCell.inc
U    packages/cocoaint/src/appkit/NSDatePickerCell.inc
U    packages/cocoaint/src/appkit/NSImage.inc
U    packages/cocoaint/src/appkit/NSBrowser.inc
U    packages/cocoaint/src/appkit/NSTokenFieldCell.inc
U    packages/cocoaint/src/appkit/NSInputServer.inc
U    packages/cocoaint/src/appkit/NSTextFieldCell.inc
U    packages/cocoaint/src/appkit/NSInputManager.inc
U    packages/cocoaint/src/appkit/NSBezierPath.inc
U    packages/cocoaint/src/appkit/NSPopUpButtonCell.inc
U    packages/cocoaint/src/appkit/NSRunningApplication.inc
U    packages/cocoaint/src/appkit/NSGraphicsContext.inc
U    packages/cocoaint/src/appkit/NSFont.inc
U    packages/cocoaint/src/appkit/NSTextStorage.inc
U    packages/cocoaint/src/appkit/NSDatePicker.inc
U    packages/cocoaint/src/appkit/NSKeyValueBinding.inc
U    packages/cocoaint/src/appkit/NSCachedImageRep.inc
U    packages/cocoaint/src/appkit/NSOpenPanel.inc
U    packages/cocoaint/src/appkit/NSTableView.inc
U    packages/cocoaint/src/appkit/NSStepper.inc
U    packages/cocoaint/src/appkit/NSDragging.inc
U    packages/cocoaint/src/appkit/NSSliderCell.inc
U    packages/cocoaint/src/appkit/NSController.inc
U    packages/cocoaint/src/appkit/NSMenuItemCell.inc
U    packages/cocoaint/src/appkit/NSText.inc
U    packages/cocoaint/src/appkit/NSDrawer.inc
U    packages/cocoaint/src/appkit/NSApplicationScripting.inc
U    packages/cocoaint/src/appkit/NSTableHeaderView.inc
U    packages/cocoaint/src/appkit/NSPopUpButton.inc
U    packages/cocoaint/src/appkit/NSToolbar.inc
U    packages/cocoaint/src/appkit/NSTextInputClient.inc
U    packages/cocoaint/src/appkit/NSMenu.inc
U    packages/cocoaint/src/appkit/NSCursor.inc
U    packages/cocoaint/src/appkit/NSImageView.inc
U    packages/cocoaint/src/appkit/NSPrintOperation.inc
U    packages/cocoaint/src/appkit/NSATSTypesetter.inc
U    packages/cocoaint/src/appkit/NSToolbarItem.inc
U    packages/cocoaint/src/appkit/NSMenuItem.inc
U    packages/cocoaint/src/appkit/NSFontPanel.inc
U    packages/cocoaint/src/appkit/NSBitmapImageRep.inc
U    packages/cocoaint/src/appkit/NSTableHeaderCell.inc
U    packages/cocoaint/src/appkit/NSGraphics.inc
U    packages/cocoaint/src/appkit/NSTabView.inc
U    packages/cocoaint/src/appkit/NSResponder.inc
U    packages/cocoaint/src/appkit/NSApplication.inc
U    packages/cocoaint/src/appkit/NSComboBox.inc
U    packages/cocoaint/src/appkit/NSTextInputContext.inc
U    packages/cocoaint/src/appkit/NSOutlineView.inc
U    packages/cocoaint/src/appkit/NSColorList.inc
U    packages/cocoaint/src/appkit/NSTextView.inc
--- Recording mergeinfo for merge of r39950 into '.':
 G   .
--- Merging r40008 into '.':
G    compiler/ncal.pas
A    tests/webtbs/tw34442.pp
--- Recording mergeinfo for merge of r40008 into '.':
 G   .
--- Merging r40009 into '.':
G    compiler/defcmp.pas
G    compiler/ncnv.pas
U    compiler/pexpr.pas
A    tests/webtbs/tw33875.pp
--- Recording mergeinfo for merge of r40009 into '.':
 G   .
--- Merging r40010 into '.':
A    tests/webtbs/tw34055.pp
G    compiler/ngtcon.pas
--- Recording mergeinfo for merge of r40010 into '.':
 G   .
--- Merging r40012 into '.':
G    compiler/defcmp.pas
G    compiler/htypechk.pas
A    tests/webtbs/tw32179.pp
--- Recording mergeinfo for merge of r40012 into '.':
 G   .
--- Merging r40367 into '.':
U    compiler/optcse.pas
--- Recording mergeinfo for merge of r40367 into '.':
 G   .
--- Merging r40373 into '.':
U    compiler/hlcgobj.pas
--- Recording mergeinfo for merge of r40373 into '.':
 G   .
--- Merging r40374 into '.':
U    compiler/ncgld.pas
--- Recording mergeinfo for merge of r40374 into '.':
 G   .
--- Merging r40375 into '.':
G    compiler/hlcgobj.pas
--- Recording mergeinfo for merge of r40375 into '.':
 G   .
--- Merging r40384 into '.':
U    compiler/psub.pas
--- Recording mergeinfo for merge of r40384 into '.':
 G   .
--- Merging r40386 into '.':
U    compiler/ngenutil.pas
U    compiler/jvm/njvmutil.pas
--- Recording mergeinfo for merge of r40386 into '.':
 G   .
--- Merging r40442 into '.':
U    compiler/ppu.pas
G    compiler/symdef.pas
--- Recording mergeinfo for merge of r40442 into '.':
 G   .
--- Merging r40443 into '.':
U    compiler/systems/i_bsd.pas
U    compiler/systems/i_linux.pas
U    compiler/systems/i_sunos.pas
U    compiler/systems/i_embed.pas
U    compiler/systems/i_android.pas
U    compiler/systems/i_aros.pas
--- Recording mergeinfo for merge of r40443 into '.':
 G   .
--- Merging r40499 into '.':
G    compiler/llvm/hlcgllvm.pas
--- Recording mergeinfo for merge of r40499 into '.':
 G   .
--- Merging r40630 into '.':
U    compiler/ncgnstld.pas
G    compiler/ninl.pas
--- Recording mergeinfo for merge of r40630 into '.':
 G   .
--- Merging r40633 into '.':
G    compiler/hlcgobj.pas
U    compiler/hlcg2ll.pas
--- Recording mergeinfo for merge of r40633 into '.':
 G   .
--- Merging r40634 into '.':
U    compiler/ncgcnv.pas
G    compiler/symdef.pas
U    compiler/llvm/nllvmcnv.pas
U    compiler/llvm/nllvmld.pas
U    compiler/i386/symcpu.pas
G    compiler/ncnv.pas
U    compiler/symcreat.pas
U    compiler/jvm/pjvm.pas
U    compiler/arm/symcpu.pas
U    compiler/powerpc/symcpu.pas
U    compiler/m68k/symcpu.pas
U    compiler/x86_64/symcpu.pas
U    compiler/blockutl.pas
U    compiler/i8086/symcpu.pas
--- Recording mergeinfo for merge of r40634 into '.':
 G   .
--- Merging r40645 into '.':
U    compiler/nobj.pas
--- Recording mergeinfo for merge of r40645 into '.':
 G   .
--- Merging r40648 into '.':
G    compiler/symcreat.pas
--- Recording mergeinfo for merge of r40648 into '.':
 G   .
--- Merging r40683 into '.':
A    tests/tbf/tb0267.pp
U    tests/webtbs/tw27349.pp
A    tests/tbs/tb0654.pp
G    compiler/nobj.pas
--- Recording mergeinfo for merge of r40683 into '.':
 G   .
--- Recording mergeinfo for merge of r40729 into '.':
 G   .
--- Merging r40771 into '.':
U    rtl/darwin/x86/x86hnd.inc
--- Recording mergeinfo for merge of r40771 into '.':
 G   .
--- Merging r40772 into '.':
G    compiler/nflw.pas
U    compiler/pmodules.pas
U    compiler/pdecsub.pas
U    compiler/pparautl.pas
G    compiler/ptype.pas
U    compiler/pdecobj.pas
U    compiler/pgenutil.pas
U    compiler/pdecl.pas
U    compiler/jvm/symcpu.pas
G    compiler/pdecvar.pas
--- Recording mergeinfo for merge of r40772 into '.':
 G   .
--- Merging r40773 into '.':
G    compiler/pdecsub.pas
U    compiler/ncgnstmm.pas
G    compiler/symcreat.pas
G    compiler/pdecl.pas
G    compiler/pmodules.pas
G    compiler/pdecobj.pas
G    compiler/psub.pas
G    compiler/symdef.pas
G    compiler/pparautl.pas
A    compiler/procdefutil.pas
G    compiler/pgenutil.pas
G    compiler/jvm/symcpu.pas
G    compiler/jvm/jvmdef.pas
G    compiler/jvm/pjvm.pas
G    compiler/nflw.pas
U    compiler/symutil.pas
G    compiler/pdecvar.pas
G    compiler/ptype.pas
U    compiler/i386/n386flw.pas
G    compiler/ncgnstld.pas
U    compiler/x86_64/nx64flw.pas
U    compiler/procinfo.pas
--- Recording mergeinfo for merge of r40773 into '.':
 G   .
--- Merging r40777 into '.':
G    compiler/ppu.pas
U    compiler/optconstprop.pas
U    compiler/pstatmnt.pas
U    compiler/optutils.pas
U    compiler/pass_2.pas
U    compiler/node.pas
U    compiler/ncgmem.pas
U    compiler/nmem.pas
G    compiler/psystem.pas
--- Recording mergeinfo for merge of r40777 into '.':
 G   .
--- Merging r40778 into '.':
G    rtl/darwin/x86/x86hnd.inc
--- Recording mergeinfo for merge of r40778 into '.':
 G   .
--- Merging r40785 into '.':
U    compiler/msgidx.inc
G    compiler/pexpr.pas
U    compiler/msg/errore.msg
U    compiler/msgtxt.inc
A    tests/webtbf/tw34821.pp
--- Recording mergeinfo for merge of r40785 into '.':
 G   .
--- Merging r40810 into '.':
G    compiler/hlcg2ll.pas
--- Recording mergeinfo for merge of r40810 into '.':
 G   .
--- Merging r41161 into '.':
G    compiler/symdef.pas
A    tests/webtbs/tw34971.pp
--- Recording mergeinfo for merge of r41161 into '.':
 G   .
--- Merging r41164 into '.':
U    tests/test/tinterlocked64mt.pp
U    tests/test/tinterlockedmt.pp
--- Recording mergeinfo for merge of r41164 into '.':
 G   .
--- Merging r41165 into '.':
U    tests/test/units/sysutils/trwsync.pp
--- Recording mergeinfo for merge of r41165 into '.':
 G   .
--- Merging r41166 into '.':
U    rtl/objpas/sysutils/sysuthrd.inc
--- Recording mergeinfo for merge of r41166 into '.':
 G   .

git-svn-id: branches/fixes_3_2@41249 -
2019-02-07 19:54:56 +00:00
..
tw0744.pp
tw0769b.pp
tw0769c.pp
tw0784.pp
tw0807.pp
tw0840.pp
tw0855.pp
tw0856.pp
tw0890.pp
tw0890a.pp
tw0893.pp
tw0896.pp
tw0896a.pp
tw1157a.pp
tw1238.pp
tw1251a.pp
tw1270.pp
tw1306.pp
tw1316.pp
tw1328.pp
tw1365.pp
tw1395.pp
tw1407.pp
tw1432.pp
tw1467.pp
tw1483.pp
tw1599.pp
tw1599b.pp
tw1633.pp
tw1642.pp
tw1655.pp
tw1681.pp
tw1754.pp
tw1754b.pp
tw1782.pp
tw1827.pp
tw1830.pp
tw1842.pp
tw1858.pp
tw1905.pp
tw1927.pp
tw1928.pp
tw1939.pp
tw1949.pp
tw1969.pp
tw1995.pp
tw2018.pp
tw2037.pp
tw2046.pp
tw2053.pp
tw2053b.pp
tw2070.pp
tw2128.pp
tw2129.pp
tw2154.pp
tw2174.pp
tw2209.pp
tw2242.pp
tw2273.pp
tw2281.pp
tw2285.pp
tw2357.pp
tw2359.pp
tw2362.pp
tw2383.pp
tw2400.pp
tw2403.pp
tw2414.pp
tw2478.pp
tw2562.pp
tw2650.pp * check for read/write after a newly declared property (mantis #26011) 2014-06-15 10:59:47 +00:00
tw2657.pp
tw2670.pp
tw2719.pp
tw2721.pp
tw2724.pp
tw2739.pp
tw2751.pp
tw2752.pp
tw2787.pp
tw2795.pp
tw2853.pp
tw2853a.pp
tw2853b.pp
tw2853c.pp
tw2878.pp
tw2972.pp
tw2972b.pp
tw2983a.pp
tw2996.pp
tw3000.pp
tw3047.pp
tw3114.pp
tw3116.pp
tw3126.pp
tw3145.pp
tw3183.pp
tw3186.pp
tw3218.pp
tw3241.pp
tw3253.pp
tw3267.pp
tw3275.pp
tw3294.pp
tw3331.pp
tw3337.pp
tw3342.pp
tw3343.pp
tw3375.pp
tw3393.pp
tw3395.pp
tw3395a.pp
tw3450.pp
tw3473.pp
tw3480.pp
tw3480a.pp
tw3488.pp
tw3495.pp
tw3502.pp
tw3553.pp
tw3562.pp
tw3583.pp
tw3626.pp
tw3631.pp * tests fail if dead values are optimized so disable dead value optimization for the tests 2014-01-30 19:44:12 +00:00
tw3643.pp
tw3644.pp
tw3662.pp
tw3680.pp
tw3716.pp
tw3738.pp
tw3740.pp
tw3790.pp
tw3812.pp
tw3930a.pp
tw3931b.pp
tw3969.pp
tw4103.pp
tw4111.pp
tw4139.pp
tw4144.pp
tw4153.pp
tw4227.pp
tw4244.pp
tw4256.pp
tw4359.pp
tw4445.pp
tw4529.pp
tw4554a.pp
tw4554b.pp
tw4554c.pp
tw4554d.pp
tw4569a.pp
tw4569b.pp
tw4619a.pp
tw4619b.pp
tw4647.pp
tw4651.pp
tw4695.pp
tw4724.pp
tw4737.pp
tw4757.pp
tw4764.pp
tw4777.pp
tw4778a.pp
tw4781a.pp
tw4781b.pp
tw4893d.pp
tw4893e.pp
tw4911.pp
tw4913.pp
tw5896a.pp
tw6036b.pp
tw6420.pp
tw6631.pp
tw6686.pp
tw6796.pp
tw6797a.pp
tw6797b.pp
tw6922.pp
tw6957.pp
tw6970.pp
tw7070.pp
tw7322.pp
tw7438.pp
tw7438a.pp
tw7752.pp
tw7989.pp
tw8019.pp
tw8031.pp
tw8079.pp
tw8140a.pp
tw8140c.pp
tw8140d.pp
tw8140e.pp
tw8150.pp
tw8150b.pp
tw8150c.pp
tw8150e.pp
tw8150f.pp
tw8150g.pp
tw8151b.pp
tw8151c.pp
tw8264a.pp
tw8398.pp
tw8451.pp
tw8465a.pp
tw8528.pp
tw8583.pp
tw8588.pp
tw8591.pp
tw8717.pp
tw8738.pas
tw8738.pp * test programs previously having extension .pas renamed to .pp so that they are found during testsuite runs 2015-02-27 13:03:13 +00:00
tw8777a.pp
tw8777b.pp
tw8777c.pp
tw8777d.pp
tw8777e.pp
tw8777h.pp
tw8777j.pp
tw8777k.pp
tw8780a.pp
tw8780b.pp
tw8780c.pp
tw8781.pp
tw9015.pp
tw9039a.pp
tw9039b.pp
tw9039c.pp * fixed duplicate field names in variant record parts 2014-10-15 10:08:43 +00:00
tw9039d.pp
tw9053.pp
tw9072a.pp
tw9072b.pp
tw9176a.pp
tw9225.pp
tw9306c.pp
tw9499.pp
tw9499a.pp
tw9509.pp
tw9522.pp
tw9522a.pp
tw9522b.pp
tw9522c.pp
tw9522d.pp
tw9522e.pp
tw9551.pp
tw9551b.pp
tw9579a.pp
tw9579b.pp
tw9894b.pp
tw9918a.pp
tw9918b.pp
tw9918c.pp
tw9918d.pp
tw10081.pp
tw10425a.pp
tw10425b.pp
tw10425c.pp
tw10425d.pp
tw10425e.pp
tw10457.pp
tw10833a.pp
tw10849.pp
tw10890a.pp
tw10998a.pp
tw11254a.pp
tw11295a.pp
tw11295b.pp
tw11619b.pp
tw11632.pp
tw11846.pp
tw11846c.pp
tw11848a.pp
tw11862a.pp
tw11970.pp
tw12075.pp
tw12109a.pp
tw12303.pp
tw12329.pp
tw12365a.cfg
tw12365a.pp
tw12365b.cfg
tw12365b.pp
tw12933.pp
tw13135.pp
tw13563a.pp
tw13815.pp
tw13956.pp
tw13971a.pp
tw13971b.pp
tw13971c.pp
tw13971d.pp
tw13971e.pp
tw13971f.pp
tw13992.pp
tw14104a.pp
tw14104b.pp
tw14104c.pp
tw14248.pp
tw14354.pp
tw14650.pp
tw14650a.pp
tw14713.pp
tw14713a.pp
tw14777.pp
tw14777a.pp
tw14849.pp
tw14862a.pp
tw14862b.pp
tw14862c.pp
tw14862d.pp
tw14862e.pp
tw14862f.pp
tw14862h.pp
tw14862i.pp
tw14929a.pp
tw14929b.pp
tw14946.pp
tw15287.pp
tw15288.pp
tw15303.pp
tw15391a.pp
tw15447.pp
tw15594a.pp
tw15594b.pp
tw15672.pp
tw15727b.pp
tw15777b.pp
tw16022.pp
tw16203.pp
tw16219.pp
tw16219a.pp
tw16234.pp
tw17341.pp
tw17455.pp
tw17646a.pp
tw18058a.pp
tw18058b.pp
tw18058c.pp
tw18096.pp
tw18096c.pp
tw18225b.pp * allow call dword ptr eax in delphi, resolves #18225 2017-03-12 16:37:48 +00:00
tw18267.pp
tw18620.pp
tw19213.pp
tw19434.pp
tw19463.pp
tw19591.pp
tw19975.pp
tw20095.pp
tw20580.pp
tw20661.pp
tw20721a.pp
tw20721b.pp
tw20721c.pp
tw20907.pp
tw20907a.pp
tw21078.pp
tw21087.pp
tw21238.pp
tw21363.pp
tw21466.pas
tw21466.pp * test programs previously having extension .pas renamed to .pp so that they are found during testsuite runs 2015-02-27 13:03:13 +00:00
tw21566.pp
tw21873.pp
tw22219.pp
tw22343a.pp
tw22343b.pp
tw22343c.pp
tw22395.pp
tw22490a.pp
tw22665a.pp
tw22665b.pp
tw22941.pp
tw23110.pp
tw23169.pp * correctly write an error if one tries to implement a method introduced in a generic in a specialization of the generic, resolves issue #23169 2015-07-28 21:16:47 +00:00
tw23546b.pp
tw23547a.pp
tw23547b.pp
tw23547c.pp
tw23571a.pp
tw23571b.pp
tw23571c.pp
tw23702.pp + add test for Mantis #23702, just to be sure that we don't re-add that already solved problem 2017-01-27 13:58:54 +00:00
tw24013.pp
tw24013a.pp
tw24013b.pp
tw24184.pp
tw24428.pp
tw24428a.pp
tw24453.pp
tw24495.pp
tw24588.pp
tw25029.pp
tw25215.pp
tw25283.pp * when freeing a procdef that hasn't been registered for writing to the ppu 2017-01-15 17:41:27 +00:00
tw25318.pp
tw25504.pp
tw25622.pp
tw25622a.pp
tw25769.pp * set an owner for open array defs being created in property declarations, resolves #25769 2018-02-25 17:36:34 +00:00
tw25788.pp * enable 40+ tests for Haiku as per mantis #30470 2016-08-14 14:09:24 +00:00
tw25861.pp * only check for _PROPERTY as a regular token, so that 2014-05-10 16:03:02 +00:00
tw25862.pp * also check for targets not supporting -gc/checkpointer functionality in 2014-03-13 20:42:18 +00:00
tw25915.pp Forgot to commit test mentioned in last commit 2014-04-04 16:10:08 +00:00
tw25951.pp * do not crash with an ie on illegal boolean expressions in conditional compilation directives, resolves #25951 2014-04-27 15:50:37 +00:00
tw26176.pp Fix for Mantis #26176. Don't handle "type helper" as unique. 2014-06-06 13:26:21 +00:00
tw26193.pp Contrary to popular believe the VMT for a generic needs to be at least generated so that check for inherited methods can be done correctly. This does however not mean that the VMT is written to the object file which is handled at a completely different place. Fixes Mantis #26193. 2014-06-06 13:05:39 +00:00
tw26363.pp * don't allow default parameter values for parameter types that don't accept 2014-06-20 19:50:20 +00:00
tw26363a.pp * don't allow default parameter values for parameter types that don't accept 2014-06-20 19:50:20 +00:00
tw26456.pp Fix for Mantis #26456. 2014-07-20 13:40:01 +00:00
tw26704.pp * check for duplicate identifiers when inserting union symtables into the 2014-10-14 20:30:14 +00:00
tw27880.pp --- Merging r40284 into '.': 2018-11-12 09:41:51 +00:00
tw28338.pp * don't crash when trying to access the call_self_node in case it doesn't 2015-06-23 21:23:29 +00:00
tw28355.pp + test that should fail compilation and already fails (mantis #28355) 2018-04-10 19:34:22 +00:00
tw28753.pp * fix for Mantis #28753: don't return generic dummys from single_type(); ensures that parameters correctly evaluate to error defs should generic dummies be used 2016-09-16 20:40:19 +00:00
tw30022.pp * don't allow implicit type conversions from pointers to c-style blocks in 2016-04-17 19:07:26 +00:00
tw30494.pp * fix Mantis #30494 by applying patch from Maciej Izak 2016-08-26 14:23:23 +00:00
tw31016.pp * do not throw an internal error if in case of an previous error the parameter class of an errordef is requested, resolves #31016 2016-11-27 13:16:12 +00:00
tw31107.pp * fix for Mantis #31107: disallow calling of ordinary record methods using the record's type. 2016-12-12 22:08:28 +00:00
tw31273.pp * disallow passing a dynarray(niln/pointerconstn) as an open array 2017-12-31 15:18:40 +00:00
tw31465.pp * fix for Mantis #31465: only consider non-static fields when checking whether a record may be used with Default() 2017-03-03 17:03:46 +00:00
tw31717.pp * made message about subroutines not being inlined a note instead of a hint, see also #33515 2018-04-05 09:51:25 +00:00
tw31936.pp * warn if the first constant element of a range set expression is greater than the second one, resolves #31936 2018-02-23 22:30:35 +00:00
tw31973.pp * fix for Mantis #31973: resolve dummy symbols earlier and print a nice error message if a generic dummy could not be resolved to an ordinary symbol 2017-06-09 14:41:26 +00:00
tw32043b.pp changes to fix #32043 2017-10-06 21:07:19 +00:00
tw32043c.pp changes to fix #32043 2017-10-06 21:07:19 +00:00
tw32075.pp * prevent crash on not yet supported attribute declarations, resolves #32075 2018-02-17 19:57:50 +00:00
tw32261.pp * patch (indention adapted) by Christo Crause to check avr inline assembler, resolves also #32261 2018-02-18 21:58:04 +00:00
tw32412a.pp * fix for Mantis #32412: correctly handle an incorrect parameter count for Delete() and Insert() intrinsics 2017-09-27 21:15:00 +00:00
tw32412b.pp * fix for Mantis #32412: correctly handle an incorrect parameter count for Delete() and Insert() intrinsics 2017-09-27 21:15:00 +00:00
tw32412c.pp * fix for Mantis #32412: correctly handle an incorrect parameter count for Delete() and Insert() intrinsics 2017-09-27 21:15:00 +00:00
tw32605.pp * check for conflicts between procedure directives specified in the 2018-01-01 16:54:04 +00:00
tw32906.pp * test for mantis #32906 (already fixed in revision 37886) 2018-01-02 18:15:30 +00:00
tw32915.pp * patch by Christo Crause: generate parameter location information in att assembler mode, resolves #32915 2018-02-05 22:11:00 +00:00
tw32949.pp * patch by Christo Crause: prevent that the compiler converts breq into jmp in inline assembler blocks, resolves #32949 2018-01-31 18:34:42 +00:00
tw34355.pp --- Merging r39877 into '.': 2018-11-12 08:36:43 +00:00
tw34821.pp --- Merging r39844 into '.': 2019-02-07 19:54:56 +00:00
uw0744.pp
uw0840a.pp
uw0840b.pp
uw0856.pp
uw2414.pp
uw3450.pp
uw3969.pp
uw4103.pp
uw6922.pp
uw8738a.pas
uw8738b.pas
uw25283.pp * when freeing a procdef that hasn't been registered for writing to the ppu 2017-01-15 17:41:27 +00:00