comparison Ui_FeedSettings.ui @ 130:1e6274cca035

merge with "backend" branch
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 22 Aug 2011 15:30:33 +0200
parents d11c3f71ac40
children a2552f1e450e
comparison
equal deleted inserted replaced
117:dc0a82841a60 130:1e6274cca035