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

3c5a8b1e

Commit 3c5a8b1e authored 16 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'master' into m_savard

parents 56a7965c 5dcd9f57

Branches

Tags

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

configure.ac 0 additions, 6 deletions

configure.ac
sflphone-gtk/.cproject 0 additions, 229 deletions

sflphone-gtk/.cproject
sflphone-gtk/.project 0 additions, 77 deletions

sflphone-gtk/.project
sflphone-gtk/.settings/org.eclipse.cdt.core.prefs 0 additions, 148 deletions

sflphone-gtk/.settings/org.eclipse.cdt.core.prefs
sflphone-gtk/.settings/org.eclipse.cdt.ui.prefs 0 additions, 4 deletions

sflphone-gtk/.settings/org.eclipse.cdt.ui.prefs
sflphone-gtk/.settings/org.eclipse.ltk.core.refactoring.prefs 0 additions, 3 deletions

...hone-gtk/.settings/org.eclipse.ltk.core.refactoring.prefs
sflphone-gtk/src/historyfilter.c 89 additions, 0 deletions

sflphone-gtk/src/historyfilter.c
sflphone-gtk/src/historyfilter.h 31 additions, 0 deletions

sflphone-gtk/src/historyfilter.h
src/sipvoiplink.cpp 0 additions, 1 deletion

src/sipvoiplink.cpp
www/img/download-up.png 0 additions, 0 deletions

www/img/download-up.png
www/img/download.png 0 additions, 0 deletions

www/img/download.png

with 120 additions and 468 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