cpp11 branch - committing the merge (rest of it)

git-svn-id: svn://ultimatepp.org/upp/trunk@7048 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-03-16 16:35:29 +00:00
parent 51687976c2
commit e5dfeba4be
58 changed files with 1176 additions and 2335 deletions

View file

@ -4,9 +4,7 @@ using namespace Upp;
GUI_APP_MAIN
{
TopWindow win;
TextDiffCtrl ctrl;
win.Add(ctrl.SizePos());
ctrl.Set(LoadFile("C:/u/upp.src/uppdev/AssistTest/main.cpp"), LoadFile("C:/u/upp.src/uppdev/ArrayCtrl/main.cpp"));
win.Run();
DirDiffDlg dlg;
dlg.Run();
}