* #36737: switch back to svn repo, remove assert in sip_transaction.c
diff --git a/jni/pjproject-android/pjlib/include/pj/activesock.h b/jni/pjproject-android/pjlib/include/pj/activesock.h
index e158471..40809c6 100644
--- a/jni/pjproject-android/pjlib/include/pj/activesock.h
+++ b/jni/pjproject-android/pjlib/include/pj/activesock.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: activesock.h 4461 2013-04-05 03:02:19Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/addr_resolv.h b/jni/pjproject-android/pjlib/include/pj/addr_resolv.h
index 7e89936..41eacc8 100644
--- a/jni/pjproject-android/pjlib/include/pj/addr_resolv.h
+++ b/jni/pjproject-android/pjlib/include/pj/addr_resolv.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: addr_resolv.h 4218 2012-08-07 02:18:15Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/array.h b/jni/pjproject-android/pjlib/include/pj/array.h
index ca73782..9b93727 100644
--- a/jni/pjproject-android/pjlib/include/pj/array.h
+++ b/jni/pjproject-android/pjlib/include/pj/array.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: array.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/assert.h b/jni/pjproject-android/pjlib/include/pj/assert.h
index 52eb9ab..41a5d11 100644
--- a/jni/pjproject-android/pjlib/include/pj/assert.h
+++ b/jni/pjproject-android/pjlib/include/pj/assert.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: assert.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/assert.h b/jni/pjproject-android/pjlib/include/pj/compat/assert.h
index e1ef24a..f1b5c96 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/assert.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/assert.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: assert.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/cc_armcc.h b/jni/pjproject-android/pjlib/include/pj/compat/cc_armcc.h
index b4af09c..f775e2a 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/cc_armcc.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/cc_armcc.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: cc_armcc.h 4624 2013-10-21 06:37:30Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -43,6 +43,7 @@
 #define PJ_THREAD_FUNC	
 #define PJ_NORETURN		
 #define PJ_ATTR_NORETURN	__attribute__ ((noreturn))
+#define PJ_ATTR_MAY_ALIAS	__attribute__ ((__may_alias__))
 
 #define PJ_HAS_INT64		1
 
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/cc_codew.h b/jni/pjproject-android/pjlib/include/pj/compat/cc_codew.h
index cdd5cf0..2f6eb4a 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/cc_codew.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/cc_codew.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: cc_codew.h 4624 2013-10-21 06:37:30Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -39,6 +39,7 @@
 #define PJ_THREAD_FUNC	
 #define PJ_NORETURN		
 #define PJ_ATTR_NORETURN	
+#define PJ_ATTR_MAY_ALIAS	
 
 #define PJ_HAS_INT64		1
 
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/cc_gcc.h b/jni/pjproject-android/pjlib/include/pj/compat/cc_gcc.h
index 77d93f3..1d62ff7 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/cc_gcc.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/cc_gcc.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: cc_gcc.h 4624 2013-10-21 06:37:30Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -53,11 +53,13 @@
   typedef uint64_t		pj_uint64_t;
   #define PJ_INLINE_SPECIFIER	static __inline
   #define PJ_ATTR_NORETURN	
+  #define PJ_ATTR_MAY_ALIAS	
 #else
   typedef long long		pj_int64_t;
   typedef unsigned long long	pj_uint64_t;
   #define PJ_INLINE_SPECIFIER	static inline
   #define PJ_ATTR_NORETURN	__attribute__ ((noreturn))
+  #define PJ_ATTR_MAY_ALIAS	__attribute__((__may_alias__))
 #endif
 
 #define PJ_INT64(val)		val##LL
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/cc_gcce.h b/jni/pjproject-android/pjlib/include/pj/compat/cc_gcce.h
index e322743..4bafca0 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/cc_gcce.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/cc_gcce.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: cc_gcce.h 4624 2013-10-21 06:37:30Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -39,6 +39,7 @@
 #define PJ_THREAD_FUNC	
 #define PJ_NORETURN		
 #define PJ_ATTR_NORETURN	__attribute__ ((noreturn))
+#define PJ_ATTR_MAY_ALIAS	__attribute__ ((__may_alias__))
 
 #define PJ_HAS_INT64		1
 
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/cc_msvc.h b/jni/pjproject-android/pjlib/include/pj/compat/cc_msvc.h
index 0b1fd68..15fd526 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/cc_msvc.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/cc_msvc.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: cc_msvc.h 4624 2013-10-21 06:37:30Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -68,6 +68,7 @@
 #define PJ_THREAD_FUNC	
 #define PJ_NORETURN		__declspec(noreturn)
 #define PJ_ATTR_NORETURN	
+#define PJ_ATTR_MAY_ALIAS	
 
 #define PJ_HAS_INT64	1
 
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/cc_mwcc.h b/jni/pjproject-android/pjlib/include/pj/compat/cc_mwcc.h
index 1efd320..86db15d 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/cc_mwcc.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/cc_mwcc.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: cc_mwcc.h 4624 2013-10-21 06:37:30Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -39,6 +39,7 @@
 #define PJ_THREAD_FUNC	
 #define PJ_NORETURN		
 #define PJ_ATTR_NORETURN	__attribute__ ((noreturn))
+#define PJ_ATTR_MAY_ALIAS	
 
 #define PJ_HAS_INT64		1
 
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/ctype.h b/jni/pjproject-android/pjlib/include/pj/compat/ctype.h
index 3adf213..a79a1a0 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/ctype.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/ctype.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ctype.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/errno.h b/jni/pjproject-android/pjlib/include/pj/compat/errno.h
index 7bbd488..a4d8fd7 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/errno.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/errno.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: errno.h 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/high_precision.h b/jni/pjproject-android/pjlib/include/pj/compat/high_precision.h
index 5ef089ec..277389f 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/high_precision.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/high_precision.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: high_precision.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/m_alpha.h b/jni/pjproject-android/pjlib/include/pj/compat/m_alpha.h
index e35a4b9..fa22f54 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/m_alpha.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/m_alpha.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: m_alpha.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/m_armv4.h b/jni/pjproject-android/pjlib/include/pj/compat/m_armv4.h
index 701e45a..74d2c84 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/m_armv4.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/m_armv4.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: m_armv4.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/m_auto.h.in b/jni/pjproject-android/pjlib/include/pj/compat/m_auto.h.in
index 79330b9..48763ea 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/m_auto.h.in
+++ b/jni/pjproject-android/pjlib/include/pj/compat/m_auto.h.in
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: m_auto.h.in 3295 2010-08-25 12:51:29Z bennylp $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/m_i386.h b/jni/pjproject-android/pjlib/include/pj/compat/m_i386.h
index f56d100..7967d6f 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/m_i386.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/m_i386.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: m_i386.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/m_m68k.h b/jni/pjproject-android/pjlib/include/pj/compat/m_m68k.h
index 45a03d3..e0469de 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/m_m68k.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/m_m68k.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: m_m68k.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/m_powerpc.h b/jni/pjproject-android/pjlib/include/pj/compat/m_powerpc.h
index 13a6992..03b2bd8 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/m_powerpc.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/m_powerpc.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: m_powerpc.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/m_sparc.h b/jni/pjproject-android/pjlib/include/pj/compat/m_sparc.h
index a1508a5..3539ea4 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/m_sparc.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/m_sparc.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: m_sparc.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/m_x86_64.h b/jni/pjproject-android/pjlib/include/pj/compat/m_x86_64.h
index f0edfaf..29795ef 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/m_x86_64.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/m_x86_64.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: m_x86_64.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/malloc.h b/jni/pjproject-android/pjlib/include/pj/compat/malloc.h
index a60b57e..94c1431 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/malloc.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/malloc.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: malloc.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/os_auto.h.in b/jni/pjproject-android/pjlib/include/pj/compat/os_auto.h.in
index 77980d3..18df2bf 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/os_auto.h.in
+++ b/jni/pjproject-android/pjlib/include/pj/compat/os_auto.h.in
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_auto.h.in 3841 2011-10-24 09:28:13Z ming $ */
 /* 
  * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/os_darwinos.h b/jni/pjproject-android/pjlib/include/pj/compat/os_darwinos.h
index 92b0b6b..49e69c2 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/os_darwinos.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/os_darwinos.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_darwinos.h 4626 2013-10-21 07:04:38Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -92,11 +92,6 @@
 
 #define PJ_ATOMIC_VALUE_TYPE		long
 
-/*
- * Socket related
- */
-typedef int socklen_t;
-
 /* Set 1 if native sockaddr_in has sin_len member. 
  * Default: 0
  */
@@ -137,8 +132,8 @@
  */
 #define PJ_THREAD_ALLOCATE_STACK    	0
 
-/* Oh well.. MacOS 10.2 doesn't have socklen_t, but 10.4 has! */
-#define PJ_HAS_SOCKLEN_T		0
+/* MacOS has had socklen since 10.4 */
+#define PJ_HAS_SOCKLEN_T		1
 
 
 #endif	/* __PJ_COMPAT_OS_DARWINOS_H__ */
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/os_linux.h b/jni/pjproject-android/pjlib/include/pj/compat/os_linux.h
index 40840e2..820d744 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/os_linux.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/os_linux.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_linux.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/os_linux_kernel.h b/jni/pjproject-android/pjlib/include/pj/compat/os_linux_kernel.h
index c395234..1894160 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/os_linux_kernel.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/os_linux_kernel.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_linux_kernel.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/os_palmos.h b/jni/pjproject-android/pjlib/include/pj/compat/os_palmos.h
index 7d403cd..1fd4d86 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/os_palmos.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/os_palmos.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_palmos.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/os_rtems.h b/jni/pjproject-android/pjlib/include/pj/compat/os_rtems.h
index b9a5047..ac7224d 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/os_rtems.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/os_rtems.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_rtems.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/os_sunos.h b/jni/pjproject-android/pjlib/include/pj/compat/os_sunos.h
index 73c132f..245c35a 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/os_sunos.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/os_sunos.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_sunos.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/os_symbian.h b/jni/pjproject-android/pjlib/include/pj/compat/os_symbian.h
index 9f95364..7906d6f 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/os_symbian.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/os_symbian.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_symbian.h 3841 2011-10-24 09:28:13Z ming $ */
 /*
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/os_win32.h b/jni/pjproject-android/pjlib/include/pj/compat/os_win32.h
index 4fa8b21..f1bd597 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/os_win32.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/os_win32.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_win32.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/os_win32_wince.h b/jni/pjproject-android/pjlib/include/pj/compat/os_win32_wince.h
index 9ae0531..d6f228d 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/os_win32_wince.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/os_win32_wince.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os_win32_wince.h 3841 2011-10-24 09:28:13Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/rand.h b/jni/pjproject-android/pjlib/include/pj/compat/rand.h
index d0b5dd0..32467ee 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/rand.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/rand.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: rand.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/setjmp.h b/jni/pjproject-android/pjlib/include/pj/compat/setjmp.h
index b0b979d..0aea218 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/setjmp.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/setjmp.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: setjmp.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/size_t.h b/jni/pjproject-android/pjlib/include/pj/compat/size_t.h
index 3f4e47b..25c58a6 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/size_t.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/size_t.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: size_t.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/socket.h b/jni/pjproject-android/pjlib/include/pj/compat/socket.h
index 23f46af..913f26b 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/socket.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/socket.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: socket.h 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/stdarg.h b/jni/pjproject-android/pjlib/include/pj/compat/stdarg.h
index 13e3075..8e1d9ab 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/stdarg.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/stdarg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: stdarg.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/stdfileio.h b/jni/pjproject-android/pjlib/include/pj/compat/stdfileio.h
index 06047f6..aba17aa 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/stdfileio.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/stdfileio.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: stdfileio.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/string.h b/jni/pjproject-android/pjlib/include/pj/compat/string.h
index fde421a..a2a78b3 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/string.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/string.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: string.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/compat/time.h b/jni/pjproject-android/pjlib/include/pj/compat/time.h
index 6ac2432..97d259a 100644
--- a/jni/pjproject-android/pjlib/include/pj/compat/time.h
+++ b/jni/pjproject-android/pjlib/include/pj/compat/time.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: time.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/config.h b/jni/pjproject-android/pjlib/include/pj/config.h
index 1f78715..23fc68d 100644
--- a/jni/pjproject-android/pjlib/include/pj/config.h
+++ b/jni/pjproject-android/pjlib/include/pj/config.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: config.h 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/ctype.h b/jni/pjproject-android/pjlib/include/pj/ctype.h
index 060ec8d..08adde8 100644
--- a/jni/pjproject-android/pjlib/include/pj/ctype.h
+++ b/jni/pjproject-android/pjlib/include/pj/ctype.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ctype.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/doxygen.h b/jni/pjproject-android/pjlib/include/pj/doxygen.h
index 81fa735..1fe198b 100644
--- a/jni/pjproject-android/pjlib/include/pj/doxygen.h
+++ b/jni/pjproject-android/pjlib/include/pj/doxygen.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: doxygen.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/errno.h b/jni/pjproject-android/pjlib/include/pj/errno.h
index 05008b1..0f96faa 100644
--- a/jni/pjproject-android/pjlib/include/pj/errno.h
+++ b/jni/pjproject-android/pjlib/include/pj/errno.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: errno.h 4461 2013-04-05 03:02:19Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/except.h b/jni/pjproject-android/pjlib/include/pj/except.h
index 9369825..d87dd8f 100644
--- a/jni/pjproject-android/pjlib/include/pj/except.h
+++ b/jni/pjproject-android/pjlib/include/pj/except.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: except.h 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/fifobuf.h b/jni/pjproject-android/pjlib/include/pj/fifobuf.h
index 8a4b2d6..37002b0 100644
--- a/jni/pjproject-android/pjlib/include/pj/fifobuf.h
+++ b/jni/pjproject-android/pjlib/include/pj/fifobuf.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: fifobuf.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/file_access.h b/jni/pjproject-android/pjlib/include/pj/file_access.h
index 30b633a..09406b1 100644
--- a/jni/pjproject-android/pjlib/include/pj/file_access.h
+++ b/jni/pjproject-android/pjlib/include/pj/file_access.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: file_access.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/file_io.h b/jni/pjproject-android/pjlib/include/pj/file_io.h
index d036543..31b7cb4 100644
--- a/jni/pjproject-android/pjlib/include/pj/file_io.h
+++ b/jni/pjproject-android/pjlib/include/pj/file_io.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: file_io.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/guid.h b/jni/pjproject-android/pjlib/include/pj/guid.h
index 7b24dd5..2a76af6 100644
--- a/jni/pjproject-android/pjlib/include/pj/guid.h
+++ b/jni/pjproject-android/pjlib/include/pj/guid.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: guid.h 4208 2012-07-18 07:52:33Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/hash.h b/jni/pjproject-android/pjlib/include/pj/hash.h
index 35c3413..5d9a2d9 100644
--- a/jni/pjproject-android/pjlib/include/pj/hash.h
+++ b/jni/pjproject-android/pjlib/include/pj/hash.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: hash.h 4208 2012-07-18 07:52:33Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/ioqueue.h b/jni/pjproject-android/pjlib/include/pj/ioqueue.h
index 1e98332..853bf48 100644
--- a/jni/pjproject-android/pjlib/include/pj/ioqueue.h
+++ b/jni/pjproject-android/pjlib/include/pj/ioqueue.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: ioqueue.h 4359 2013-02-21 11:18:36Z bennylp $
  */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
diff --git a/jni/pjproject-android/pjlib/include/pj/ip_helper.h b/jni/pjproject-android/pjlib/include/pj/ip_helper.h
index f8266cd..02441d3 100644
--- a/jni/pjproject-android/pjlib/include/pj/ip_helper.h
+++ b/jni/pjproject-android/pjlib/include/pj/ip_helper.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ip_helper.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/list.h b/jni/pjproject-android/pjlib/include/pj/list.h
index 0cc4b99..8a13dcb 100644
--- a/jni/pjproject-android/pjlib/include/pj/list.h
+++ b/jni/pjproject-android/pjlib/include/pj/list.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: list.h 4624 2013-10-21 06:37:30Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -74,7 +74,7 @@
 struct pj_list
 {
     PJ_DECL_LIST_MEMBER(void);
-};
+} PJ_ATTR_MAY_ALIAS; /* may_alias avoids warning with gcc-4.4 -Wall -O2 */
 
 
 /**
diff --git a/jni/pjproject-android/pjlib/include/pj/list_i.h b/jni/pjproject-android/pjlib/include/pj/list_i.h
index 91ee183..1ae8da8 100644
--- a/jni/pjproject-android/pjlib/include/pj/list_i.h
+++ b/jni/pjproject-android/pjlib/include/pj/list_i.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: list_i.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/lock.h b/jni/pjproject-android/pjlib/include/pj/lock.h
index b1a5d72..e9b26c7 100644
--- a/jni/pjproject-android/pjlib/include/pj/lock.h
+++ b/jni/pjproject-android/pjlib/include/pj/lock.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: lock.h 4359 2013-02-21 11:18:36Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/log.h b/jni/pjproject-android/pjlib/include/pj/log.h
index 96dc485..c9d5c31 100644
--- a/jni/pjproject-android/pjlib/include/pj/log.h
+++ b/jni/pjproject-android/pjlib/include/pj/log.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: log.h 4584 2013-08-30 04:03:22Z bennylp $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/math.h b/jni/pjproject-android/pjlib/include/pj/math.h
index 85f264a..22f3e4d 100644
--- a/jni/pjproject-android/pjlib/include/pj/math.h
+++ b/jni/pjproject-android/pjlib/include/pj/math.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: math.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/os.h b/jni/pjproject-android/pjlib/include/pj/os.h
index 3ce877a..9733bb9 100644
--- a/jni/pjproject-android/pjlib/include/pj/os.h
+++ b/jni/pjproject-android/pjlib/include/pj/os.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: os.h 3664 2011-07-19 03:42:28Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/pool.h b/jni/pjproject-android/pjlib/include/pj/pool.h
index 9adaeca..f35bb03 100644
--- a/jni/pjproject-android/pjlib/include/pj/pool.h
+++ b/jni/pjproject-android/pjlib/include/pj/pool.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool.h 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/pool_alt.h b/jni/pjproject-android/pjlib/include/pj/pool_alt.h
index 6b9b9df..713e825 100644
--- a/jni/pjproject-android/pjlib/include/pj/pool_alt.h
+++ b/jni/pjproject-android/pjlib/include/pj/pool_alt.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_alt.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/pool_buf.h b/jni/pjproject-android/pjlib/include/pj/pool_buf.h
index b7cf180..28734a7 100644
--- a/jni/pjproject-android/pjlib/include/pj/pool_buf.h
+++ b/jni/pjproject-android/pjlib/include/pj/pool_buf.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_buf.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/pool_i.h b/jni/pjproject-android/pjlib/include/pj/pool_i.h
index 2f5d407..376fd6a 100644
--- a/jni/pjproject-android/pjlib/include/pj/pool_i.h
+++ b/jni/pjproject-android/pjlib/include/pj/pool_i.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pool_i.h 4298 2012-11-22 05:00:01Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/rand.h b/jni/pjproject-android/pjlib/include/pj/rand.h
index 1a69183..8c8eb7e 100644
--- a/jni/pjproject-android/pjlib/include/pj/rand.h
+++ b/jni/pjproject-android/pjlib/include/pj/rand.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: rand.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/rbtree.h b/jni/pjproject-android/pjlib/include/pj/rbtree.h
index 7bc8742..2f92285 100644
--- a/jni/pjproject-android/pjlib/include/pj/rbtree.h
+++ b/jni/pjproject-android/pjlib/include/pj/rbtree.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: rbtree.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/sock.h b/jni/pjproject-android/pjlib/include/pj/sock.h
index b7d1cb0..0155f1c 100644
--- a/jni/pjproject-android/pjlib/include/pj/sock.h
+++ b/jni/pjproject-android/pjlib/include/pj/sock.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock.h 4538 2013-06-19 09:06:55Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/sock_qos.h b/jni/pjproject-android/pjlib/include/pj/sock_qos.h
index c23204b..fbd9afd 100644
--- a/jni/pjproject-android/pjlib/include/pj/sock_qos.h
+++ b/jni/pjproject-android/pjlib/include/pj/sock_qos.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_qos.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/sock_select.h b/jni/pjproject-android/pjlib/include/pj/sock_select.h
index 1b5b335..dc39db1 100644
--- a/jni/pjproject-android/pjlib/include/pj/sock_select.h
+++ b/jni/pjproject-android/pjlib/include/pj/sock_select.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sock_select.h 3553 2011-05-05 06:14:19Z nanang $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/ssl_sock.h b/jni/pjproject-android/pjlib/include/pj/ssl_sock.h
index bfad5af..ecc08a9 100644
--- a/jni/pjproject-android/pjlib/include/pj/ssl_sock.h
+++ b/jni/pjproject-android/pjlib/include/pj/ssl_sock.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: ssl_sock.h 4506 2013-04-26 06:01:43Z bennylp $ */
 /* 
  * Copyright (C) 2009-2011 Teluu Inc. (http://www.teluu.com)
  *
diff --git a/jni/pjproject-android/pjlib/include/pj/string.h b/jni/pjproject-android/pjlib/include/pj/string.h
index 525b4c0..849a474 100644
--- a/jni/pjproject-android/pjlib/include/pj/string.h
+++ b/jni/pjproject-android/pjlib/include/pj/string.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: string.h 4440 2013-03-14 07:18:13Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/string_i.h b/jni/pjproject-android/pjlib/include/pj/string_i.h
index 5379486..8bb86f1 100644
--- a/jni/pjproject-android/pjlib/include/pj/string_i.h
+++ b/jni/pjproject-android/pjlib/include/pj/string_i.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: string_i.h 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/timer.h b/jni/pjproject-android/pjlib/include/pj/timer.h
index df6155a..fd7e71d 100644
--- a/jni/pjproject-android/pjlib/include/pj/timer.h
+++ b/jni/pjproject-android/pjlib/include/pj/timer.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: timer.h 4567 2013-07-19 06:31:28Z bennylp $ */
 /* 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/jni/pjproject-android/pjlib/include/pj/types.h b/jni/pjproject-android/pjlib/include/pj/types.h
index 420ddd9..230175a 100644
--- a/jni/pjproject-android/pjlib/include/pj/types.h
+++ b/jni/pjproject-android/pjlib/include/pj/types.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: types.h 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
diff --git a/jni/pjproject-android/pjlib/include/pj/unicode.h b/jni/pjproject-android/pjlib/include/pj/unicode.h
index 503bc24..8da448a 100644
--- a/jni/pjproject-android/pjlib/include/pj/unicode.h
+++ b/jni/pjproject-android/pjlib/include/pj/unicode.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: unicode.h 4537 2013-06-19 06:47:43Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>