Hi Mark,
 
I just tried to commit some files and got a conflict (listed below). I
resolved it using "mine" because I couldn't see any changes that were in
your files but not in mine - I could only see my changes. Then I committed
(rev 7553). Hope I haven't over-written anything. 
 
Revision: 7528
Author: miesfeld
Date: 14 February 2012 04:31:09
Message:
first attempt at straightening out props on ooDialog UserGuide files
----
Modified :
/main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer
/CustomerListView.rex
Modified :
/main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer
/CustomerModelData.rex
Modified :
/main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer
/CustomerView.rex
Modified :
/main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer
/StartupCustomer.rex
Modified :
/main/trunk/samples/windows/oodialog/userGuide/exercises/Exercise06/Customer
/StartupCustomerList.rex

Atb,
Oliver

------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Oorexx-devel mailing list
Oorexx-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/oorexx-devel

Reply via email to