tedkulp / cmsmadesimple-2-0 fork watch download tarball
public
Description: Git mirror of the CMS Made Simple 2.0 rewrite
Homepage: http://cmsmadesimple.org
Clone URL: git://github.com/tedkulp/cmsmadesimple-2-0.git
Search Repo: 
Updated notes in results.txt with files I removed

git-svn-id: http://svn.cmsmadesimple.org/svn/cmsmadesimple/trunk@4096 
3d254a34-79dc-0310-9e5f-be208747d8a0
tedkulp (author)
Sun Aug 26 18:00:03 -0700 2007
commit  053be2667a61b885ef611712edd507d27ca2e214
tree    7d3df7911fc5ba80e519abcb252cc3b7fb2c8665
parent  a7924db3d5b75a5230cb933b09375027ee429139
0
results.txt 
...
81
82
83
84
 
85
86
87
88
89
90
91
 
92
93
94
...
107
108
109
110
111
112
113
114
 
 
 
 
 
115
116
117
 
 
118
119
120
121
122
123
124
 
 
 
 
 
 
125
126
127
128
129
130
 
131
132
133
134
135
 
136
137
138
...
147
148
149
150
 
151
152
153
 
...
81
82
83
 
84
85
86
87
88
89
90
 
91
92
93
94
...
107
108
109
 
 
 
 
 
110
111
112
113
114
115
 
 
116
117
118
 
 
 
 
 
 
119
120
121
122
123
124
125
126
127
128
129
 
130
131
132
133
134
 
135
136
137
138
...
147
148
149
 
150
151
152
153
 
0
@@ -81,14 +81,14 @@ Auto-merged admin/siteprefs.php
0
 CONFLICT (content): Merge conflict in admin/siteprefs.php  --  FIXED
0
 Auto-merged admin/style.php
0
 Auto-merged admin/templatecss.php
0
-CONFLICT (delete/modify): admin/themes/default/defaultTheme.php deleted in 2.0 and modified in HEAD. Version HEAD of admin/themes/default/defaultTheme.php left in tree.
0
+CONFLICT (delete/modify): admin/themes/default/defaultTheme.php deleted in 2.0 and modified in HEAD. Version HEAD of admin/themes/default/defaultTheme.php left in tree.  --  DELETED
0
 Auto-merged include.php
0
 CONFLICT (content): Merge conflict in include.php  --  FIXED
0
 Auto-merged index.php
0
 CONFLICT (content): Merge conflict in index.php  --  FIXED
0
 Auto-merged install/index.php
0
 CONFLICT (add/add): Merge conflict in install/index.php  --  FIXED
0
-CONFLICT (delete/modify): install/install.php deleted in HEAD and modified in 2.0. Version 2.0 of install/install.php left in tree.
0
+CONFLICT (delete/modify): install/install.php deleted in HEAD and modified in 2.0. Version 2.0 of install/install.php left in tree.  --  DELETED
0
 Auto-merged install/schemas/extra.sql
0
 CONFLICT (content): Merge conflict in install/schemas/extra.sql  --  FIXED
0
 Auto-merged install/upgrade.php
0
@@ -107,32 +107,32 @@ Auto-merged lib/classes/class.admintheme.inc.php
0
 CONFLICT (content): Merge conflict in lib/classes/class.admintheme.inc.php  --  FIXED
0
 Removed lib/classes/class.bookmark.inc.php
0
 Removed lib/classes/class.bookmarkoperations.inc.php
0
-CONFLICT (delete/modify): lib/classes/class.content.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.content.inc.php left in tree.
0
-CONFLICT (delete/modify): lib/classes/class.contentoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.contentoperations.inc.php left in tree.
0
-CONFLICT (delete/modify): lib/classes/class.events.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.events.inc.php left in tree.
0
-CONFLICT (delete/modify): lib/classes/class.global.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.global.inc.php left in tree.
0
-CONFLICT (delete/modify): lib/classes/class.globalcontentoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.globalcontentoperations.inc.php left in tree.
0
+CONFLICT (delete/modify): lib/classes/class.content.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.content.inc.php left in tree.  --  DELETED
0
+CONFLICT (delete/modify): lib/classes/class.contentoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.contentoperations.inc.php left in tree.  --  DELETED
0
+CONFLICT (delete/modify): lib/classes/class.events.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.events.inc.php left in tree.  --  DELETED
0
+CONFLICT (delete/modify): lib/classes/class.global.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.global.inc.php left in tree.  --  DELETED
0
+CONFLICT (delete/modify): lib/classes/class.globalcontentoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.globalcontentoperations.inc.php left in tree.  --  DELETED
0
 Removed lib/classes/class.group.inc.php
0
-CONFLICT (delete/modify): lib/classes/class.moduleoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.moduleoperations.inc.php left in tree.
0
-CONFLICT (delete/modify): lib/classes/class.pageinfo.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.pageinfo.inc.php left in tree.
0
+CONFLICT (delete/modify): lib/classes/class.moduleoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.moduleoperations.inc.php left in tree.  --  DELETED
0
+CONFLICT (delete/modify): lib/classes/class.pageinfo.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.pageinfo.inc.php left in tree.  --  DELETED
0
 Removed lib/classes/class.recentpage.inc.php
0
-CONFLICT (delete/modify): lib/classes/class.stylesheet.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.stylesheet.inc.php left in tree.
0
-CONFLICT (delete/modify): lib/classes/class.stylesheetoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.stylesheetoperations.inc.php left in tree.
0
-CONFLICT (delete/modify): lib/classes/class.template.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.template.inc.php left in tree.
0
-CONFLICT (delete/modify): lib/classes/class.templateoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.templateoperations.inc.php left in tree.
0
-CONFLICT (delete/modify): lib/classes/class.user.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.user.inc.php left in tree.
0
-CONFLICT (delete/modify): lib/classes/class.useroperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.useroperations.inc.php left in tree.
0
+CONFLICT (delete/modify): lib/classes/class.stylesheet.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.stylesheet.inc.php left in tree.  --  DELETED
0
+CONFLICT (delete/modify): lib/classes/class.stylesheetoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.stylesheetoperations.inc.php left in tree.  --  DELETED
0
+CONFLICT (delete/modify): lib/classes/class.template.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.template.inc.php left in tree.  --  DELETED
0
+CONFLICT (delete/modify): lib/classes/class.templateoperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.templateoperations.inc.php left in tree.  --  DELETED
0
+CONFLICT (delete/modify): lib/classes/class.user.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.user.inc.php left in tree.  --  DELETED
0
+CONFLICT (delete/modify): lib/classes/class.useroperations.inc.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/classes/class.useroperations.inc.php left in tree.  --  DELETED
0
 Auto-merged lib/classes/contenttypes/Content.inc.php
0
 CONFLICT (content): Merge conflict in lib/classes/contenttypes/Content.inc.php  --  FIXED
0
 Auto-merged lib/classes/contenttypes/Link.inc.php
0
 CONFLICT (content): Merge conflict in lib/classes/contenttypes/Link.inc.php  --  FIXED
0
 Removed lib/classes/module_support/modlang.inc.php
0
-CONFLICT (delete/modify): lib/content.functions.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/content.functions.php left in tree.
0
+CONFLICT (delete/modify): lib/content.functions.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/content.functions.php left in tree.  --  DELETED
0
 Auto-merged lib/filemanager/ImageManager/Classes/Thumbnail.php
0
 Auto-merged lib/filemanager/ImageManager/Classes/Transform.php
0
 Auto-merged lib/misc.functions.php
0
 CONFLICT (content): Merge conflict in lib/misc.functions.php  --  FIXED (Took the 2.0 one, will have to backport methods...  but would rather find more API-like places to put these anyway)
0
-CONFLICT (delete/modify): lib/module.functions.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/module.functions.php left in tree.
0
+CONFLICT (delete/modify): lib/module.functions.php deleted in 2.0 and modified in HEAD. Version HEAD of lib/module.functions.php left in tree.  --  DELETED
0
 Auto-merged lib/page.functions.php
0
 CONFLICT (content): Merge conflict in lib/page.functions.php  --  FIXED
0
 Auto-merged lib/translation.functions.php
0
@@ -147,7 +147,7 @@ Auto-merged plugins/function.metadata.php
0
 CONFLICT (content): Merge conflict in plugins/function.metadata.php  --  FIXED
0
 Auto-merged plugins/function.news.php
0
 CONFLICT (content): Merge conflict in plugins/function.news.php  --  FIXED
0
-CONFLICT (delete/modify): preview.php deleted in 2.0 and modified in HEAD. Version HEAD of preview.php left in tree.
0
+CONFLICT (delete/modify): preview.php deleted in 2.0 and modified in HEAD. Version HEAD of preview.php left in tree.  --  DELETED
0
 Auto-merged release-cleanup.sh
0
 Removed stylesheet.css
0
 Auto-merged stylesheet.php

Comments

    No one has commented yet.