Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

8feca640

Commit 8feca640 authored 16 years ago by Emmanuel Milou

Downloads
- Patches
- Plain Diff

[#1220] Add Conflicts: sflphone in debian control files

parent 343b08c3

Branches

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/debian/control.hardy 2 additions, 1 deletion

sflphone-client-gnome/debian/control.hardy
sflphone-client-gnome/debian/control.intrepid 2 additions, 1 deletion

sflphone-client-gnome/debian/control.intrepid
sflphone-client-gnome/debian/control.jaunty 2 additions, 1 deletion

sflphone-client-gnome/debian/control.jaunty
sflphone-common/debian/control.hardy 2 additions, 1 deletion

sflphone-common/debian/control.hardy
sflphone-common/debian/control.intrepid 2 additions, 1 deletion

sflphone-common/debian/control.intrepid
sflphone-common/debian/control.jaunty 2 additions, 1 deletion

sflphone-common/debian/control.jaunty

with 12 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment