Merge in upstream changes

This commit is contained in:
Brant K. Kyser 2013-01-05 02:25:15 -06:00
commit 54b576d8b2
3 changed files with 12 additions and 4 deletions

5
.gitignore vendored
View file

@ -2,6 +2,9 @@
*.o *.o
*.class *.class
# Editor junk
*.sw?
# Local PCRE # Local PCRE
prce pcre
*.gz *.gz

View file

@ -5,6 +5,11 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.10 (in progress) Version 2.0.10 (in progress)
============================ ============================
2013-01-03: wsfulton 2013-01-04: wsfulton
Pull patch from BrantKyser to fix directors and nspace feature when multilevel namespaces are used. [Java] Pull patch #2 from BrantKyser to fix SF Bug #1283 - fix smart pointers in conjuction
with directors.
2013-01-03: wsfulton
[Java] Pull patch #1 from BrantKyser to fix SF Bug #1278 - fix directors and nspace feature when
multilevel namespaces are used.