[jitsi~svn:10199] Updates merge ignores.

damencho at java.net damencho at java.net
Wed Dec 19 08:47:05 CET 2012


Project:    jitsi
Repository: svn
Revision:   10199
Author:     damencho
Date:       2012-12-19 07:47:02 UTC
Link:       

Log Message:
------------
Updates merge ignores.


Revisions:
----------
10199


Modified Paths:
---------------
jitsi-android


Diffs:
------

Property changes on: jitsi-android
___________________________________________________________________
Modified: merge-ignores
   - resources
src/net/java/sip/communicator/impl/gui
src/net/java/sip/communicator/impl/neomedia
src/net/java/sip/communicator/impl/shutdowntimeout
src/net/java/sip/communicator/impl/sysactivity/NetworkManagerListenerImpl.java
src/net/java/sip/communicator/plugin/addrbook
src/net/java/sip/communicator/plugin/generalconfig
src/net/java/sip/communicator/plugin/jabberaccregwizz

   + resources
src/net/java/sip/communicator/impl/gui
src/net/java/sip/communicator/impl/neomedia
src/net/java/sip/communicator/impl/shutdowntimeout
src/net/java/sip/communicator/impl/sysactivity/NetworkManagerListenerImpl.java
src/net/java/sip/communicator/plugin/addrbook
src/net/java/sip/communicator/plugin/generalconfig
src/net/java/sip/communicator/plugin/jabberaccregwizz
lib/native/windows
lib/native/windows-64
lib/native/freebsd
lib/native/freebsd-64
lib/native/linux
lib/native/linux-64
lib/native/mac
lib/native/solaris
lib/native/solaris-sparc









More information about the commits mailing list