autodoc.git/ resolution.log.txt

2010-10-06

2010-10-06 10:14:50 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• e28636a1b685d28cfaa29f9ea571f0871cf45639 (15 lines) (+15/-0) ^{[ Show | Annotate ]}
  Branch: 8.0
  Tags: v7.9.2

Merge remote branch 'pike-modules/whitefish/5.0' into 7.9

Updated Search.Utils and Search.Process to a non-roxen context.

Conflicts:
.gitattributes
.gitignore
lib/modules/.autodoc

158:    "SSL.Constants.AUTHLEVEL_ask": "predef::SSL.context":1,    "SSL.Constants.AUTHLEVEL_none": "predef::SSL.context":1,    "SSL.Constants.AUTHLEVEL_require": "predef::SSL.context":1, +  "Search.Database.MySQL": "predef::Search.Utils.ProfileEntry.get_database":1,    "Second": "7.6::Calendar.YMD.datetime":1, "7.6::Calendar.YMD.second":2, "predef::Calendar.YMD.datetime":1, "predef::Calendar.YMD.second":2,    "Second ": "7.6::Calendar.YMD.second":2, "predef::Calendar.YMD.second":2,    "SimpleElementNode": "predef::Parser.XML.Tree.SimpleRootNode.get_element_by_id":1,
177:    "Text.footnote()": "predef::Protocols.LysKOM.Session.create_text":1,    "TimeRanges.SuperTimeRange": "predef::Calendar.Time.SuperTimeRange":1,    "TimeZone ": "predef::Calendar.Time.Fraction.set_timezone":1, "predef::Calendar.TimeRange.set_timezone":1, +  "Token": "predef::Search.Grammar.Lexer.tokenize":1,    "Toole.Standalone.process_files": "predef::Tools.Standalone.process_files":1,    "Tools.Standalone.features": "predef::Tools.Install.features":1,    "Type": "predef::GTK.new_build_pgtk.Constant":1, "predef::GTK.new_build_pgtk.Constant.create":1, "predef::GTK.new_build_pgtk.Function":2, "predef::GTK.new_build_pgtk.Function.create":2, "predef::GTK.new_build_pgtk.Member":1, "predef::GTK.new_build_pgtk.Member.create":1, "predef::GTK2.build_pgtk.Constant":1, "predef::GTK2.build_pgtk.Constant.create":1, "predef::GTK2.build_pgtk.Function":2, "predef::GTK2.build_pgtk.Function.create":2, "predef::GTK2.build_pgtk.Member":1, "predef::GTK2.build_pgtk.Member.create":1, "predef::GTK2.build_pgtk.Property":1, "predef::GTK2.build_pgtk.Property.create":1,
190:    "_ADT": "predef::ADT":1,    "_Protocols_DNS_SD.Service": "predef::Protocols.DNS_SD.Service":1,    "_SimpleRegexp": "predef::Regexp.SimpleRegexp":1, +  "_WhiteFish.Blobs": "predef::Search.MergeFile.write_blobs":1,    "___MIME": "predef::MIME":1,    "__joinnode": "predef::Local":1,    "_debug": "predef::Debug.dump_backlog":1,
267:    "int ": "7.6::Calendar.YMD.YMD.fraction_no":12, "7.6::Calendar.YMD.second":3, "predef::Calendar.Time.SuperTimeRange.second":3, "predef::Calendar.Time.TimeofDay.hour":1, "predef::Calendar.Time.TimeofDay.hour_no":3, "predef::Calendar.Time.TimeofDay.minute":1, "predef::Calendar.Time.TimeofDay.second":1, "predef::Calendar.Time.TimeofDay.unix_time":1, "predef::Calendar.TimeRange.`/":2, "predef::Calendar.TimeRange.offset_to":1, "predef::Calendar.YMD.YMD.fraction_no":12, "predef::Calendar.YMD.second":3, "predef::Image.Color.Color.`==":4, "predef::Image.Color.Color.bits":1, "predef::Image.Color.Color.rgb":2, "predef::Image.Image.`==":9, "predef::Image.Image.gradients":2, "predef::Image.Image.xsize":1, "predef::Image.Image.ysize":1, "predef::Image.Layer.set_offset":2, "predef::Image.Layer.set_tiled":1, "predef::Image.Layer.xsize":2,    "iri_decode": "predef::Protocols.HTTP.iri_normalize":1,    "jobject": "predef::Java.JArray":1, "predef::Java.JBoolean":1, "predef::Java.JFloat":1, "predef::Java.JHashMap":1, "predef::Java.JInteger":1, "predef::Java.JString":1, +  "language_code": "predef::Search.Database.Base.get_document_id":1,    "layers": "predef::Image.Layer":1,    "ldapfd": "predef::Protocols.LDAP.protocol.error_number":1,    "lfun::random": "predef::random":1,
278:    "method ": "7.6::Calendar.YMD.datetime":1, "predef::Calendar.YMD.datetime":1,    "method int ": "7.6::Calendar.YMD.YMD.fraction_no":1, "predef::Calendar.YMD.YMD.fraction_no":1,    "mixed ": "predef::Image.Layer.set_misc_value":2, +  "mtime": "predef::Search.Database.Base.set_lastmodified":1,    "object ": "predef::Image.AVS.decode":1, "predef::Image.BMP.decode":2, "predef::Image.Color.Color.grey":2, "predef::Image.Color.Color.light":5, "predef::Image.Color.guess":1, "predef::Image.Color.rgb":5, "predef::Image.Colortable.`+":1, "predef::Image.Colortable.`-":1, "predef::Image.Colortable.cast":1, "predef::Image.Colortable.create":5, "predef::Image.Colortable.cubicles":3, "predef::Image.Colortable.floyd_steinberg":2, "predef::Image.Colortable.full":1, "predef::Image.Colortable.image":1, "predef::Image.Colortable.map":6, "predef::Image.Colortable.nodither":1, "predef::Image.Colortable.ordered":5, "predef::Image.Colortable.randomcube":4, "predef::Image.Colortable.reduce":2, "predef::Image.Colortable.rigid":2, "predef::Image.Colortable.spacefactors":1, "predef::Image.GIF.decode":3, "predef::Image.GIF.decode_layers":4, "predef::Image.HRZ.decode":1, "predef::Image.ILBM.decode":3, "predef::Image.Image.`&":3, "predef::Image.Image.`*":4, "predef::Image.Image.`+":3, "predef::Image.Image.`-":3, "predef::Image.Image.`/":6, "predef::Image.Image.`|":3, "predef::Image.Image.apply_curve":3, "predef::Image.Image.apply_matrix":3, "predef::Image.Image.apply_max":3, "predef::Image.Image.autocrop":5, "predef::Image.Image.bitscale":5, "predef::Image.Image.box":3, "predef::Image.Image.change_color":2, "predef::Image.Image.circle":3, "predef::Image.Image.clone":4, "predef::Image.Image.color":4, "predef::Image.Image.copy":4, "predef::Image.Image.dct":1, "predef::Image.Image.distancesq":2, "predef::Image.Image.gamma":2, "predef::Image.Image.grey":2, "predef::Image.Image.grey_blur":1, "predef::Image.Image.invert":1, "predef::Image.Image.line":3, "predef::Image.Image.match":4, "predef::Image.Image.mirrorx":1, "predef::Image.Image.mirrory":1, "predef::Image.Image.modify_by_intensity":1, "predef::Image.Image.orient":1, "predef::Image.Image.outline":10, "predef::Image.Image.paste":2, "predef::Image.Image.paste_alpha":2, "predef::Image.Image.paste_alpha_color":6, "predef::Image.Image.paste_mask":2, "predef::Image.Image.phaseh":4, "predef::Image.Image.polyfill":1, "predef::Image.Image.random":4, "predef::Image.Image.rgb_to_hsv":2, "predef::Image.Image.rgb_to_yuv":2, "predef::Image.Image.rotate":4, "predef::Image.Image.rotate_ccw":1, "predef::Image.Image.rotate_cw":1, "predef::Image.Image.scale":6, "predef::Image.Image.select_from":2, "predef::Image.Image.setcolor":2, "predef::Image.Image.setpixel":4, "predef::Image.Image.skewx":8, "predef::Image.Image.skewy":8, "predef::Image.Image.test":2, "predef::Image.Image.threshold":4, "predef::Image.Image.tuned_box":1, "predef::Image.Image.write_lsb_rgb":2, "predef::Image.Layer.autocrop":2, "predef::Image.Layer.clone":1, "predef::Image.Layer.crop":1, "predef::Image.Layer.set_alpha_value":1, "predef::Image.Layer.set_fill":4, "predef::Image.Layer.set_image":2, "predef::Image.Layer.set_mode":1, "predef::Image.Layer.set_offset":1, "predef::Image.Layer.set_tiled":1, "predef::Image.PCX.decode":1, "predef::Image.PNM.decode":1, "predef::Image.PVR.decode":2, "predef::Image.RAS.decode":1, "predef::Image.TGA._decode":1, "predef::Image.TGA.decode":1, "predef::Image.TIM.decode":2, "predef::Image.TTF.Face.`()":1, "predef::Image.TTF.Face.flush":1, "predef::Image.TTF.`()":2, "predef::Image.X.decode_pseudocolor":1, "predef::Image.X.decode_truecolor":2, "predef::Image.XBM._decode":2, "predef::Image.XBM.decode":1, "predef::Image.XCF.___decode":1, "predef::Image.XCF.__decode":1, "predef::Image.XCF.decode":1, "predef::Image.XFace.decode":2, "predef::Image.XFace.decode_header":2, "predef::Image.XWD.decode":1,    "old": "predef::Parser.XML.Tree.AbstractNode.add_child":2,    "openat()": "predef::Stdio.Fd.fd_factory":2,
315:    "read_oob_cb": "predef::Stdio.File.set_read_callback":1,    "resolveRefs()": "predef::Tools.AutoDoc.ProcessXML.postProcess":2,    "ruleset.set_timezone": "predef::Calendar.Timezone":2, +  "search_order": "predef::Search.Query.execute":1,    "second.datetime": "7.6::Calendar.YMD.datetime":1, "predef::Calendar.YMD.datetime":1,    "set_charset": "predef::Mysql.mysql.create":3,    "set_short_namespaces()": "predef::Parser.XML.Tree.VirtualNode.get_short_attributes":1,
335:    "typeof()": "predef::_typeof":1,    "tzname": "predef::Calendar.Timezone":1,    "uname": "predef::Protocols.IRC.Client.create":1, +  "uri_prefix": "predef::Search.Database.Base.list_url_by_prefix":1,    "verify_target()": "predef::Protocols.Bittorrent.Torrent.fix_targets":1,    "verison": "predef::SSL.session.set_cipher_suite":1,    "void ": "7.6::Calendar.YMD.Week.create":8, "7.6::Calendar.YMD.Year.create":5, "predef::Calendar.SuperTimeRange.create":1, "predef::Calendar.Time.Fraction.create":4, "predef::Calendar.Time.TimeofDay.create":2, "predef::Calendar.Time.call_out":1, "predef::Calendar.TimeRange.create":4, "predef::Calendar.YMD.Week.create":8, "predef::Calendar.YMD.Year.create":5, "predef::Image.Color.Color.create":1, "predef::Image.Colortable.create":6, "predef::Image.Image.clear":3, "predef::Image.Image.create":6, "predef::Image.Image.noise":2, "predef::Image.Image.turbulence":2, "predef::Image.Layer.create":5, "predef::Image.TTF.FaceInstance.create":1,
998:   "predef::SSL.sslfile": "System.EPIPE"   "predef::SSL.state.decrypt_packet": "Alert"   "predef::SSL.state.encrypt_packet": "Alert" + "predef::Search.Database.Base.get_document_id": "language_code" + "predef::Search.Database.Base.list_url_by_prefix": "uri_prefix" + "predef::Search.Database.Base.set_lastmodified": "mtime" + "predef::Search.Grammar.Lexer.tokenize": "Token" + "predef::Search.MergeFile.write_blobs": "_WhiteFish.Blobs" + "predef::Search.Query.execute": "search_order" + "predef::Search.Utils.ProfileEntry.get_database": "Search.Database.MySQL"   "predef::Sql.Sql": "Zerowrapper"   "predef::Sql.pgsql.create": "SQL_ASCII" "UTF8" "standard_conforming_strings" "template1"   "predef::Sql.pgsql.drop_db": "template1"