merge diff from trunk
Showing
- AUTHORS 3 additions, 1 deletionAUTHORS
- COPYING 622 additions, 288 deletionsCOPYING
- ChangeLog 29 additions, 0 deletionsChangeLog
- Makefile.am 11 additions, 1 deletionMakefile.am
- README.html 3 additions, 1 deletionREADME.html
- README.osx 99 additions, 0 deletionsREADME.osx
- THANKS 0 additions, 1 deletionTHANKS
- TODO.osx 36 additions, 0 deletionsTODO.osx
- autogen.sh 11 additions, 3 deletionsautogen.sh
- configure.ac 79 additions, 2 deletionsconfigure.ac
- data/Makefile.am 1 addition, 1 deletiondata/Makefile.am
- data/emoticons/animated/emoticons.py 1 addition, 0 deletionsdata/emoticons/animated/emoticons.py
- data/emoticons/static-big/emoticons.py 4 additions, 0 deletionsdata/emoticons/static-big/emoticons.py
- data/emoticons/static-big/lion.png 0 additions, 0 deletionsdata/emoticons/static-big/lion.png
- data/emoticons/static/emoticons.py 4 additions, 0 deletionsdata/emoticons/static/emoticons.py
- data/emoticons/static/lion.png 0 additions, 0 deletionsdata/emoticons/static/lion.png
- data/gajim-remote.1 1 addition, 1 deletiondata/gajim-remote.1
- data/gajim.desktop.in.in 3 additions, 4 deletionsdata/gajim.desktop.in.in
- data/glade/account_context_menu.glade 39 additions, 17 deletionsdata/glade/account_context_menu.glade
- data/glade/account_creation_wizard_window.glade 70 additions, 22 deletionsdata/glade/account_creation_wizard_window.glade
Loading
Please register or sign in to comment