[Gtkradiant] CVS: cleaning up stuff duplicated by merge

William Joseph gtkradiant@zerowing.idsoftware.com
Fri, 31 Jan 2003 09:15:08 -0600


This is a mixed plain/HTML MIME encoded message.

--10440261084713
Content-Type: text/plain

User   : spog
Branch : spog_branch
Root   : zerowing:/cvs
Date   : 2003/01/31  09:15:01

cleaning up stuff duplicated by merge

--

8 files modified :

  GtkRadiant/include/qerplugin.h
    1.30.2.1.2.9 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qerplugin.h?rev=1.30.2.1.2.9
    1.30.2.1.2.8 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qerplugin.h?rev=1.30.2.1.2.8
    diff : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qerplugin.h.diff?r1=1.30.2.1.2.8&r2=1.30.2.1.2.9

  GtkRadiant/include/qertypes.h
    1.31.2.1.2.11 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qertypes.h?rev=1.31.2.1.2.11
    1.31.2.1.2.10 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qertypes.h?rev=1.31.2.1.2.10
    diff : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qertypes.h.diff?r1=1.31.2.1.2.10&r2=1.31.2.1.2.11

  GtkRadiant/plugins/entity/entity.cpp
    1.2.2.1.2.4 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/plugins/entity/entity.cpp?rev=1.2.2.1.2.4
    1.2.2.1.2.3 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/plugins/entity/entity.cpp?rev=1.2.2.1.2.3
    diff : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/plugins/entity/entity.cpp.diff?r1=1.2.2.1.2.3&r2=1.2.2.1.2.4

  GtkRadiant/radiant/eclass_def.cpp
    1.6.2.1.2.7 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/eclass_def.cpp?rev=1.6.2.1.2.7
    1.6.2.1.2.6 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/eclass_def.cpp?rev=1.6.2.1.2.6
    diff : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/eclass_def.cpp.diff?r1=1.6.2.1.2.6&r2=1.6.2.1.2.7

  GtkRadiant/radiant/main.cpp
    1.50.2.9 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/main.cpp?rev=1.50.2.9
    1.50.2.8 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/main.cpp?rev=1.50.2.8
    diff : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/main.cpp.diff?r1=1.50.2.8&r2=1.50.2.9

  GtkRadiant/radiant/pluginmanager.cpp
    1.76.2.1.2.13 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/pluginmanager.cpp?rev=1.76.2.1.2.13
    1.76.2.1.2.12 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/pluginmanager.cpp?rev=1.76.2.1.2.12
    diff : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/pluginmanager.cpp.diff?r1=1.76.2.1.2.12&r2=1.76.2.1.2.13

  GtkRadiant/radiant/qe3.h
    1.61.2.1.2.15 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/qe3.h?rev=1.61.2.1.2.15
    1.61.2.1.2.14 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/qe3.h?rev=1.61.2.1.2.14
    diff : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/qe3.h.diff?r1=1.61.2.1.2.14&r2=1.61.2.1.2.15

  GtkRadiant/radiant/xywindow.cpp
    1.33.2.1.2.16 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/xywindow.cpp?rev=1.33.2.1.2.16
    1.33.2.1.2.15 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/xywindow.cpp?rev=1.33.2.1.2.15
    diff : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/xywindow.cpp.diff?r1=1.33.2.1.2.15&r2=1.33.2.1.2.16


--10440261084713
Content-Type: text/html

<html>
<head><title>CVS report</title></head>
<body bgcolor="#ffffff" text="#000000">

<table border=0 width="100%" cellspacing=0 cellpadding=0>
 <tr>
<td align=left><b>Commit from <i>spog</i> on branch <i>spog_branch</i></b></td>
  <td align=right valign=bottom>2003/01/31  &nbsp; 09:15:01</td>
 </tr>
</table>
<hr width="100%" size=2 noshade><br>

<code>
cleaning up stuff duplicated by merge<br>
</code>
<hr width="100%" size=2 noshade><br>
<code>
<table border=0 width="100%">

 <tr>
  <td colspan=5>&nbsp;</td>
 </tr>
 <tr bgcolor="#e0e0e0">
  <td colspan=5 align=center><b>8 files modified</b></td>
 </tr>
 <tr>
  <td><b>Module</b></td>
  <td><b>File name</b></td>
  <td colspan=3><b>Version</b></td>
 </tr>
 <tr>
  <td><b>GtkRadiant</b></td>
  <td><code>include/qerplugin.h</code></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qerplugin.h?rev=1.30.2.1.2.8">1.30.2.1.2.8</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qerplugin.h.diff?r1=text&tr1=1.30.2.1.2.8&r2=text&tr2=1.30.2.1.2.9&f=h">&gt;&gt;&gt;</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qerplugin.h?rev=1.30.2.1.2.9">1.30.2.1.2.9</a></td>
 </tr>
 <tr>
  <td><b>GtkRadiant</b></td>
  <td><code>include/qertypes.h</code></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qertypes.h?rev=1.31.2.1.2.10">1.31.2.1.2.10</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qertypes.h.diff?r1=text&tr1=1.31.2.1.2.10&r2=text&tr2=1.31.2.1.2.11&f=h">&gt;&gt;&gt;</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/include/qertypes.h?rev=1.31.2.1.2.11">1.31.2.1.2.11</a></td>
 </tr>
 <tr>
  <td><b>GtkRadiant</b></td>
  <td><code>plugins/entity/entity.cpp</code></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/plugins/entity/entity.cpp?rev=1.2.2.1.2.3">1.2.2.1.2.3</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/plugins/entity/entity.cpp.diff?r1=text&tr1=1.2.2.1.2.3&r2=text&tr2=1.2.2.1.2.4&f=h">&gt;&gt;&gt;</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/plugins/entity/entity.cpp?rev=1.2.2.1.2.4">1.2.2.1.2.4</a></td>
 </tr>
 <tr>
  <td><b>GtkRadiant</b></td>
  <td><code>radiant/eclass_def.cpp</code></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/eclass_def.cpp?rev=1.6.2.1.2.6">1.6.2.1.2.6</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/eclass_def.cpp.diff?r1=text&tr1=1.6.2.1.2.6&r2=text&tr2=1.6.2.1.2.7&f=h">&gt;&gt;&gt;</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/eclass_def.cpp?rev=1.6.2.1.2.7">1.6.2.1.2.7</a></td>
 </tr>
 <tr>
  <td><b>GtkRadiant</b></td>
  <td><code>radiant/main.cpp</code></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/main.cpp?rev=1.50.2.8">1.50.2.8</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/main.cpp.diff?r1=text&tr1=1.50.2.8&r2=text&tr2=1.50.2.9&f=h">&gt;&gt;&gt;</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/main.cpp?rev=1.50.2.9">1.50.2.9</a></td>
 </tr>
 <tr>
  <td><b>GtkRadiant</b></td>
  <td><code>radiant/pluginmanager.cpp</code></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/pluginmanager.cpp?rev=1.76.2.1.2.12">1.76.2.1.2.12</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/pluginmanager.cpp.diff?r1=text&tr1=1.76.2.1.2.12&r2=text&tr2=1.76.2.1.2.13&f=h">&gt;&gt;&gt;</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/pluginmanager.cpp?rev=1.76.2.1.2.13">1.76.2.1.2.13</a></td>
 </tr>
 <tr>
  <td><b>GtkRadiant</b></td>
  <td><code>radiant/qe3.h</code></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/qe3.h?rev=1.61.2.1.2.14">1.61.2.1.2.14</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/qe3.h.diff?r1=text&tr1=1.61.2.1.2.14&r2=text&tr2=1.61.2.1.2.15&f=h">&gt;&gt;&gt;</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/qe3.h?rev=1.61.2.1.2.15">1.61.2.1.2.15</a></td>
 </tr>
 <tr>
  <td><b>GtkRadiant</b></td>
  <td><code>radiant/xywindow.cpp</code></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/xywindow.cpp?rev=1.33.2.1.2.15">1.33.2.1.2.15</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/xywindow.cpp.diff?r1=text&tr1=1.33.2.1.2.15&r2=text&tr2=1.33.2.1.2.16&f=h">&gt;&gt;&gt;</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/radiant/xywindow.cpp?rev=1.33.2.1.2.16">1.33.2.1.2.16</a></td>
 </tr>

</table>

</body>
</html>

--10440261084713--