Free Software Foundation!

Join now

Browse wiki

Jump to: navigation,
Majentis
Computer languages C++  +
Full description The Majentis CVS Conflict Editor is a conflict resolution tool for CVS based on the wxWindows platform. It displays the current file, the CVS file, and the end result of the conflict resolution.
Homepage URL http://www.majentis.com/Products/CVSConflictEditor.html  +
Interface x-window-system  +
Is GNU false  +
Keywords CVS  + , version control  + , resolution  + , conflict  +
Last review by Janet Casey +
Last review date 12 July 2005  +
License GPLv2 +
License verified by Janet Casey  +
License verified date 21 May 2004  +
Name Majentis  +
Prerequisite description CVS  + , wxWindows 2.4.2  +
Prerequisite kind Required to use  +
Real name Gerald Brandt  +
Related projects CVSps + , Cvsdelta + , Cvschk + , PLM + , CVSTrac +
Resource URL mailto:info@majentis.com  +
Resource audience Bug Tracking  + , Developer  + , Support  +
Resource kind E-mail  +
Revisionid 1,161  +
Revisiontimestamp 12 April 2011 08:43:58  +
Revisionuser User:WikiSysop +
Role Maintainer  +
Short description Conflict resolution tool for CVS  +
Software-development version-control  +
Submitted by Database conversion +
Submitted date 1 April 2011  +
Use software-development  +
User level none  +
Version-control cvs  +
Version comment 1.2.0 stable released 2004-05-21
Version date 21 May 2004  +
Version download http://www.majentis.com/Files/Conflict_Editor/conflicteditor.tar.gz  +
Version identifier 1.2.0  +
Version status stable  +
Has queryThis property is a special property in this wiki. Majentis + , Majentis + , Majentis + , Majentis + , Majentis + , Majentis + , Majentis + , Majentis + , Majentis +
Modification dateThis property is a special property in this wiki. 17 May 2014 00:54:55  +
Page has default formThis property is a special property in this wiki. Entry  +
Has subobjectThis property is a special property in this wiki. Majentis + , Majentis + , Majentis + , Majentis + , Majentis +
EmailThis property is a special property in this wiki. info@majentis.com  +
hide properties that link here 
Majentis + License of
Majentis + Person of
CVSTrac + , CVSps + , Cvschk + , Cvsdelta + , PLM + Related projects
Majentis + Resource of
Majentis + , Majentis + Software prerequisite of
 

 

Enter the name of the page to start browsing from.



Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the page “GNU Free Documentation License”.

The copyright and license notices on this page only apply to the text on this page. Any software or copyright-licenses or other similar notices described in this text has its own copyright notice and license, which can usually be found in the distribution or license text itself.


Personal tools
Namespaces

Variants
Views
Actions
Navigation
Contribute