[vlc-devel] commit: mozilla: Resolve files with conflicting licensing terms ( Jean-Paul Saman )

[git version control]

vlc | branch: 0.9-bugfix | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Fri Mar 13 12:47:52 2009 +0100| [124c5955605d69b8bd0df40e3c80527c93332f7a] | committer: Jean-Baptiste Kempf 

mozilla: Resolve files with conflicting licensing terms

Renamed:
 npunix.c to npunix_old.c
 npwin.cpp to npwin_old.cpp

Added new files from mozilla source code
 npunix.c
 npwin.cpp

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=124c5955605d69b8bd0df40e3c80527c93332f7a
---

 projects/mozilla/support/npunix.c      |  399 ++++++++---------
 projects/mozilla/support/npunix_old.c  |  752 ++++++++++++++++++++++++++++++++
 projects/mozilla/support/npwin.cpp     |  428 +++++--------------
 projects/mozilla/support/npwin_old.cpp |  573 ++++++++++++++++++++++++
 4 files changed, 1614 insertions(+), 538 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=124c5955605d69b8bd0df40e3c80527c93332f7a