Merge branch 'w291' of https://github.com/berendt/osc

Browse Source

Conflicts:
	osc/build.py

Resolved merge conflict.

...

This commit is contained in:

Marcus Huewe 2014-08-14 17:24:28 +02:00

parent 1751bdc47f d35983d5b8

commit b07a4d0b37

8 changed files with 73 additions and 73 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