Minor cleanup prior to merging to master

.travis.yml

@@ -56,4 +56,3 @@ script:
 branches:
   only:
     - master
-    - gsoc2009-matevz

Examples/Makefile.in

@@ -1520,7 +1520,7 @@ endif
 r_cpp: $(CXXSRCS)
 	$(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACEPATH)
 ifneq ($(CXXSRCS),)
-	$(CXX) -g -c $(CFLAGS) $(R_CFLAGS) $(CXXSRCS) $(INCLUDES) 
+	$(CXX) -g -c $(CXXFLAGS) $(R_CFLAGS) $(CXXSRCS) $(INCLUDES) 
 endif
 	+( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) $(OBJS) > /dev/null )
 

Lib/php/director.swg

@@ -1,7 +1,4 @@
 /* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
  * director.swg
  *
  * This file contains support for director classes that proxy

Source/Swig/warn.c

@@ -1,38 +0,0 @@
-/* -----------------------------------------------------------------------------
- * This file is part of SWIG, which is licensed as a whole under version 3 
- * (or any later version) of the GNU General Public License. Some additional
- * terms also apply to certain portions of SWIG. The full details of the SWIG
- * license and copyrights can be found in the LICENSE and COPYRIGHT files
- * included with the SWIG source code as distributed by the SWIG developers
- * and at http://www.swig.org/legal.html.
- *
- * warn.c
- *
- * SWIG warning framework.  This was added to warn developers about 
- * deprecated APIs and other features.
- * ----------------------------------------------------------------------------- */
-
-char cvsroot_warn_c[] = "$Id$";
-
-#include "swig.h"
-
-static Hash *warnings = 0;
-
-/* -----------------------------------------------------------------------------
- * Swig_warn()
- * 
- * Issue a warning
- * ----------------------------------------------------------------------------- */
-
-void Swig_warn(const char *filename, int line, const char *msg) {
-  String *key;
-  if (!warnings) {
-    warnings = NewHash();
-  }
-  key = NewStringf("%s:%d", filename, line);
-  if (!Getattr(warnings, key)) {
-    Printf(stderr, "swig-dev warning:%s:%d:%s\n", filename, line, msg);
-    Setattr(warnings, key, key);
-  }
-  Delete(key);
-}