mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-21 06:45:39 -06:00
urepo added to canonical upp.src packages; cosmetics
git-svn-id: svn://ultimatepp.org/upp/trunk@11377 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
75dcf63347
commit
d3b70d407e
4 changed files with 4 additions and 2 deletions
|
|
@ -531,7 +531,7 @@ void Ctrl::Dump(Stream& s) const {
|
||||||
LG("Rect: " << GetRect());
|
LG("Rect: " << GetRect());
|
||||||
LG("View: " << GetView());
|
LG("View: " << GetView());
|
||||||
for(int i = 0; i < frame.GetCount(); i++)
|
for(int i = 0; i < frame.GetCount(); i++)
|
||||||
LG("Frame " << i << ": " << typeid(*frame[i].frame).name() << " - " << frame[i].view);
|
LG("Frame " << i << ": " << typeid(decltype(*frame[i].frame)).name() << " - " << frame[i].view);
|
||||||
LG("Data: " << GetData().ToString());
|
LG("Data: " << GetData().ToString());
|
||||||
if(firstchild) {
|
if(firstchild) {
|
||||||
LG("Children");
|
LG("Children");
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@ Image MacroElement::GetImage() const
|
||||||
return MacroManagerImg::Macro();
|
return MacroManagerImg::Macro();
|
||||||
case(Type::FUNCTION):
|
case(Type::FUNCTION):
|
||||||
return MacroManagerImg::Fn();
|
return MacroManagerImg::Fn();
|
||||||
|
case(Type::UNKNOWN): // silence CLANG warning
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return Image();
|
return Image();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,7 @@ TextDiffCtrl
|
||||||
ODBC
|
ODBC
|
||||||
MSSQL
|
MSSQL
|
||||||
usvn
|
usvn
|
||||||
|
urepo
|
||||||
art
|
art
|
||||||
Painter
|
Painter
|
||||||
XmlRpc
|
XmlRpc
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,6 @@ bool RepoSync::ListGit(const String& path)
|
||||||
color = Gray;
|
color = Gray;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
int q = file.ReverseFind('.');
|
|
||||||
static const char *as[] = {
|
static const char *as[] = {
|
||||||
"Modify", "Resolved", "Add", "Remove", "Rename"
|
"Modify", "Resolved", "Add", "Remove", "Rename"
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue