Merge commit '199f9655' into manualmerge

Browse Source

these files no longer exist in jb-mr2-dev, so this patch is useless.
Accept the version in jb-mr2-dev

...

This commit is contained in:

Nick Kralevich

2013-03-01 10:01:29 -08:00

parent e606757966 199f965552

commit 2ce5173afb

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

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

Diff Content Not Available