Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frmContactEditorVendor: Form design cleanup
[xestiaab/.git]
/
source
/
frmConflictResolution.h
diff --git
a/source/frmConflictResolution.h
b/source/frmConflictResolution.h
index
a4c4877
..
09e90ea
100644
(file)
--- a/
source/frmConflictResolution.h
+++ b/
source/frmConflictResolution.h
@@
-50,7
+50,7
@@
class frmConflictResolution : public frmConflictResolutionADT
/** Constructor */
frmConflictResolution( wxWindow* parent );
int GetResult();
/** Constructor */
frmConflictResolution( wxWindow* parent );
int GetResult();
- void LoadData(vCard *LocalObj, vCard *ServerObj, std::map<wxString, wxString> *MemoryFSList);
+ void LoadData(vCard *LocalObj, vCard *ServerObj, std::map<wxString, wxString> *MemoryFSList
, wxString backgroundColour
);
//// end generated class members
};
//// end generated class members
};
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy