merging upstream changes

.gitignore

@@ -0,0 +1 @@
+/RetroShare.pro.user

.travis.yml

@@ -0,0 +1,50 @@
+language: cpp
+
+compiler:
+  - gcc
+
+before_install:
+  - echo $LANG
+  - echo $LC_ALL
+  - sudo apt-get update
+  - sudo apt-get install build-essential checkinstall cmake g++ git libavcodec-dev libavformat-dev libbz2-dev libcurl4-openssl-dev libdc1394-22-dev libglib2.0-dev libcv-dev libopencv-highgui-dev libhighgui-dev
+  - sudo apt-get install libgnome-keyring-dev libgstreamer-plugins-base0.10-dev libgstreamer0.10-dev libjasper-dev libjpeg-dev libmicrohttpd-dev libopencv-dev libprotobuf-dev libqt4-dev
+  - sudo apt-get install libspeex-dev libspeexdsp-dev libsqlite3-dev libssl-dev libswscale-dev
+  - sudo apt-get install libtbb-dev libtiff4-dev libupnp-dev libv4l-dev libxine-dev libxslt1-dev libxss-dev make pkg-config protobuf-compiler python-dev python-numpy subversion git yasm qtmobility-dev
+#  - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update && sudo apt-get install -y llvm-3.4 llvm-3.4-dev; fi
+#  - rvm use $RVM --install --binary --fuzzy
+#  - gem update --system
+#  - gem --version
+
+before_script:
+  - qmake
+
+script: make
+
+#after_success:
+#  - if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then rake deploy; fi
+
+#branches:
+#  only:
+#    - master
+#    - travis
+
+notifications:
+  email: false
+  irc:
+    channels:
+      - "chat.freenode.net#retroshare"
+    template:
+      - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
+#  webhooks:
+#    urls:
+#      - https://webhooks.gitter.im/e/9502afd22ca6c8e85fb3
+#    on_success: change
+#    on_failure: always
+#    on_start: always
+
+#env:
+#  - RVM=2.0.0 LANG="en_US.UTF-8"
+
+os:
+  - linux