Merge remote branch 'origin/f13/master'

Browse Source

Conflicts:
	.gitignore
	orc.spec
	sources

Signed-off-by: Fabian Deutsch <fabian.deutsch@gmx.de>

...

This commit is contained in:

Fabian Deutsch 2010-08-21 14:22:12 +02:00

parent 717584b982 14ebe9255c

commit 40b952412d

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