Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv16882/src/classes
Modified Files:
Moptions.cpp
Log Message:
resolved conflict with my changes
Index: Moptions.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Moptions.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -b -u -2 -r1.60 -r1.61
--- Moptions.cpp 28 Aug 2003 16:24:02 -0000 1.60
+++ Moptions.cpp 28 Aug 2003 20:34:17 -0000 1.61
@@ -83,4 +83,6 @@
const MOption MP_PROFILE_TYPE;
+const MOption MP_CONFIG_SOURCE_TYPE;
+const MOption MP_CONFIG_SOURCE_PRIO;
const MOption MP_VERSION;
const MOption MP_FIRSTRUN;
@@ -473,5 +475,4 @@
const MOption MP_AWAY_STATUS;
const MOption MP_CREATE_INTERNAL_MESSAGE;
-const MOption MP_CONFIG_SOURCE_TYPE;
// ----------------------------------------------------------------------------
@@ -485,4 +486,6 @@
{
DEFINE_OPTION(MP_PROFILE_TYPE),
+ DEFINE_OPTION(MP_CONFIG_SOURCE_TYPE),
+ DEFINE_OPTION(MP_CONFIG_SOURCE_PRIO),
DEFINE_OPTION(MP_VERSION),
DEFINE_OPTION(MP_FIRSTRUN),
@@ -869,5 +872,4 @@
DEFINE_OPTION(MP_AWAY_STATUS),
DEFINE_OPTION(MP_CREATE_INTERNAL_MESSAGE),
- DEFINE_OPTION(MP_CONFIG_SOURCE_TYPE),
};
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
