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

a7e9b61a

Commit a7e9b61a authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'yun_dev'

parents 1d7d0580 7bfeb38f

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

AUTHORS 6 additions, 1 deletion

AUTHORS
ChangeLog 6 additions, 0 deletions

ChangeLog
po/Makefile.am 4 additions, 2 deletions

po/Makefile.am
po/README 17 additions, 0 deletions

po/README
po/zh_CN.po 579 additions, 0 deletions

po/zh_CN.po
sflphone-gtk/src/calltree.c 1 addition, 1 deletion

sflphone-gtk/src/calltree.c
sflphone-gtk/src/dialpad.c 1 addition, 0 deletions

sflphone-gtk/src/dialpad.c
sflphone-gtk/src/menus.c 2 additions, 1 deletion

sflphone-gtk/src/menus.c
src/main.cpp 16 additions, 2 deletions

src/main.cpp

with 632 additions and 7 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