Viewing all changes in revision 373.
- Committer: Tarmac
- Date: 2012-08-13 13:55:41 UTC
- mfrom: (371.2.4 cosas-conflict-resolution)
- Revision ID: tarmac-20120813135541-0umgfwmdn4v4muli
- added UI for conflict resolution
- files added:
- cosas/conflicts.ui
- files modified:
- cosas/cosas.ui
expand all
collapse all
added
removed
