Merge branch 'nepomuk/DmsPort-resourceWatcher' into tmp

Browse Source

Conflicts:
	cmake/modules/FindXine.cmake

...

This commit is contained in:

Sebastian Trueg 2012-01-27 14:19:44 +01:00

parent fd2357e7d9 fa05392f1c

commit 1de227bbba

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