Resolved conflict. DarkWyrm tweaked the old version (which I had #if 0'd

Browse Source

out all over the place).  There is now a giant
#ifdef USING_TEMPLATE_MADNESS
separating the two versions.  At some point, the common code should be
reconciled.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2953 a95241bf-73f2-0310-859d-f6bbb57e9c96

...

This commit is contained in:

ejakowatz 2003-03-19 05:02:31 +00:00

parent 9862b5925d

commit 9abaf1dfa7

1 changed files with 1345 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1349

src/kits/app/Message.cpp

View File

File diff suppressed because it is too large Load Diff