merge with trunk ignoring trunk change

Browse Source

svn path=/nixpkgs/branches/libpng15/; revision=29476

...

This commit is contained in:

Yury G. Kudryashov 2011-09-24 20:47:47 +00:00

parent e36d140c08

commit 213d522806

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

Diff Content Not Available