FCL/sftools/fbf/configs/default: doc/api/python/ccm.conflict.ObjectAndBaselineConflict-class.html@508ecc9021d2 (annotated)

432 f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	1	<?xml version="1.0" encoding="ascii"?>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	2	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	3	"DTD/xhtml1-transitional.dtd">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	4	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	5	<head>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	6	<title>ccm.conflict.ObjectAndBaselineConflict</title>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	7	<link rel="stylesheet" href="epydoc.css" type="text/css" />
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	8	<script type="text/javascript" src="epydoc.js"></script>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	9	</head>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	10
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	11	<body bgcolor="white" text="black" link="blue" vlink="#204080"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	12	alink="#204080">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	13	<!-- ==================== NAVIGATION BAR ==================== -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	14	<table class="navbar" border="0" width="100%" cellpadding="0"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	15	bgcolor="#a0c0ff" cellspacing="0">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	16	<tr valign="middle">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	17
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	18	<!-- Tree link -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	19	<th>   <a
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	20	href="module-tree.html">Trees</a>   </th>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	21
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	22	<!-- Index link -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	23	<th>   <a
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	24	href="identifier-index.html">Indices</a>   </th>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	25
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	26	<!-- Help link -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	27	<th>   <a
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	28	href="help.html">Help</a>   </th>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	29
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	30	<th class="navbar" width="100%"></th>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	31	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	32	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	33	<table width="100%" cellpadding="0" cellspacing="0">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	34	<tr valign="top">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	35	<td width="100%">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	36	<span class="breadcrumbs">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	37	<a href="ccm-module.html">Package ccm</a> ::
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	38	<a href="ccm.conflict-module.html">Module conflict</a> ::
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	39	Class ObjectAndBaselineConflict
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	40	</span>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	41	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	42	<td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	43	<table cellpadding="0" cellspacing="0">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	44	<!-- hide/show private -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	45	<tr><td align="right"><span class="options">[<a href="javascript:void(0);" class="privatelink"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	46	onclick="toggle_private();">hide private</a>]</span></td></tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	47	<tr><td align="right"><span class="options"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	48	>[<a href="frames.html" target="_top">frames</a
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	49	>] \| <a href="ccm.conflict.ObjectAndBaselineConflict-class.html"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	50	target="_top">no frames</a>]</span></td></tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	51	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	52	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	53	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	54	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	55	<!-- ==================== CLASS DESCRIPTION ==================== -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	56	<h1 class="epydoc">Class ObjectAndBaselineConflict</h1><span class="codelink"><a href="ccm.conflict-pysrc.html#ObjectAndBaselineConflict">source code</a></span><br /><br />
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	57	<pre class="base-tree">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	58	<a href="ccm.conflict.Conflict-class.html">Conflict</a> --+
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	59	\|
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	60	<strong class="uidshort">ObjectAndBaselineConflict</strong>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	61	</pre>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	62
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	63	<hr />
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	64	<!-- ==================== INSTANCE METHODS ==================== -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	65	<a name="section-InstanceMethods"></a>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	66	<table class="summary" border="1" cellpadding="3"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	67	cellspacing="0" width="100%" bgcolor="white">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	68	<tr bgcolor="#70b0f0" class="table-header">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	69	<td colspan="2" class="table-header">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	70	<table border="0" cellpadding="0" cellspacing="0" width="100%">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	71	<tr valign="top">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	72	<td align="left"><span class="table-header">Instance Methods</span></td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	73	<td align="right" valign="top"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	74	><span class="options">[<a href="#section-InstanceMethods"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	75	class="privatelink" onclick="toggle_private();"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	76	>hide private</a>]</span></td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	77	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	78	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	79	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	80	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	81	<tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	82	<td width="15%" align="right" valign="top" class="summary">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	83	<span class="summary-type"> </span>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	84	</td><td class="summary">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	85	<table width="100%" cellpadding="0" cellspacing="0" border="0">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	86	<tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	87	<td><span class="summary-sig"><a href="ccm.conflict.ObjectAndBaselineConflict-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	88	<span class="summary-sig-arg">baseline</span>,
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	89	<span class="summary-sig-arg">object</span>,
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	90	<span class="summary-sig-arg">oat</span>)</span></td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	91	<td align="right" valign="top">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	92	<span class="codelink"><a href="ccm.conflict-pysrc.html#ObjectAndBaselineConflict.__init__">source code</a></span>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	93
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	94	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	95	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	96	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	97
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	98	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	99	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	100	<tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	101	<td width="15%" align="right" valign="top" class="summary">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	102	<span class="summary-type"> </span>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	103	</td><td class="summary">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	104	<table width="100%" cellpadding="0" cellspacing="0" border="0">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	105	<tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	106	<td><span class="summary-sig"><a href="ccm.conflict.ObjectAndBaselineConflict-class.html#comment" class="summary-sig-name">comment</a>(<span class="summary-sig-arg">self</span>)</span></td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	107	<td align="right" valign="top">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	108	<span class="codelink"><a href="ccm.conflict-pysrc.html#ObjectAndBaselineConflict.comment">source code</a></span>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	109
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	110	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	111	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	112	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	113
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	114	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	115	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	116	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	117	<!-- ==================== METHOD DETAILS ==================== -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	118	<a name="section-MethodDetails"></a>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	119	<table class="details" border="1" cellpadding="3"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	120	cellspacing="0" width="100%" bgcolor="white">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	121	<tr bgcolor="#70b0f0" class="table-header">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	122	<td colspan="2" class="table-header">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	123	<table border="0" cellpadding="0" cellspacing="0" width="100%">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	124	<tr valign="top">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	125	<td align="left"><span class="table-header">Method Details</span></td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	126	<td align="right" valign="top"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	127	><span class="options">[<a href="#section-MethodDetails"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	128	class="privatelink" onclick="toggle_private();"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	129	>hide private</a>]</span></td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	130	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	131	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	132	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	133	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	134	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	135	<a name="__init__"></a>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	136	<div>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	137	<table class="details" border="1" cellpadding="3"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	138	cellspacing="0" width="100%" bgcolor="white">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	139	<tr><td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	140	<table width="100%" cellpadding="0" cellspacing="0" border="0">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	141	<tr valign="top"><td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	142	<h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	143	<span class="sig-arg">baseline</span>,
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	144	<span class="sig-arg">object</span>,
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	145	<span class="sig-arg">oat</span>)</span>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	146	<br /><em class="fname">(Constructor)</em>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	147	</h3>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	148	</td><td align="right" valign="top"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	149	><span class="codelink"><a href="ccm.conflict-pysrc.html#ObjectAndBaselineConflict.__init__">source code</a></span>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	150	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	151	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	152
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	153
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	154	<dl class="fields">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	155	<dt>Overrides:
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	156	<a href="ccm.conflict.Conflict-class.html#__init__">Conflict.__init__</a>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	157	</dt>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	158	</dl>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	159	</td></tr></table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	160	</div>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	161	<a name="comment"></a>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	162	<div>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	163	<table class="details" border="1" cellpadding="3"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	164	cellspacing="0" width="100%" bgcolor="white">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	165	<tr><td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	166	<table width="100%" cellpadding="0" cellspacing="0" border="0">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	167	<tr valign="top"><td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	168	<h3 class="epydoc"><span class="sig"><span class="sig-name">comment</span>(<span class="sig-arg">self</span>)</span>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	169	</h3>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	170	</td><td align="right" valign="top"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	171	><span class="codelink"><a href="ccm.conflict-pysrc.html#ObjectAndBaselineConflict.comment">source code</a></span>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	172	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	173	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	174
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	175
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	176	<dl class="fields">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	177	<dt>Overrides:
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	178	<a href="ccm.conflict.Conflict-class.html#comment">Conflict.comment</a>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	179	</dt>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	180	</dl>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	181	</td></tr></table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	182	</div>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	183	<br />
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	184	<!-- ==================== NAVIGATION BAR ==================== -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	185	<table class="navbar" border="0" width="100%" cellpadding="0"
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	186	bgcolor="#a0c0ff" cellspacing="0">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	187	<tr valign="middle">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	188
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	189	<!-- Tree link -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	190	<th>   <a
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	191	href="module-tree.html">Trees</a>   </th>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	192
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	193	<!-- Index link -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	194	<th>   <a
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	195	href="identifier-index.html">Indices</a>   </th>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	196
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	197	<!-- Help link -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	198	<th>   <a
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	199	href="help.html">Help</a>   </th>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	200
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	201	<th class="navbar" width="100%"></th>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	202	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	203	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	204	<table border="0" cellpadding="0" cellspacing="0" width="100%%">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	205	<tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	206	<td align="left" class="footer">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	207	Generated by Epydoc 3.0beta1 on Wed Sep 09 13:44:18 2009
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	208	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	209	<td align="right" class="footer">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	210	<a href="http://epydoc.sourceforge.net">http://epydoc.sourceforge.net</a>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	211	</td>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	212	</tr>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	213	</table>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	214
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	215	<script type="text/javascript">
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	216	<!--
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	217	// Private objects are initially displayed (because if
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	218	// javascript is turned off then we want them to be
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	219	// visible); but by default, we want to hide them. So hide
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	220	// them unless we have a cookie that says to show them.
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	221	checkCookie()
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	222	// -->
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	223	</script>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	224
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	225	</body>
f2ddfa555b0f Add FBF documents for default config that built PDK 2.0.e Shabe Razvi <shaber@symbian.org> parents: diff changeset	226	</html>

author	Simon Howkins <simonh@symbian.org>
	Fri, 03 Sep 2010 11:53:15 +0100
branch	RCL_1
changeset 1248	508ecc9021d2
parent 432	f2ddfa555b0f
permissions	-rw-r--r--