fix .gitignor

.gitignore

@@ -12,36 +12,6 @@ build64
 sed*
 *latex*
 DerivedData
-Documentation/html
-Documentation/pdf
-#Documentation/source/_group*
-#Documentation/source/_prefs.rst
-#Documentation/source/plugins
-libs/hoedown/hoedown.xcodeproj/
-libs/libtess/libtess.xcodeproj/
-libs/libtess/tess.xcodeproj/
-libs/ceres/ceres.xcodeproj/
-libs/openMVG/openMVG.xcodeproj/
-libs/libmv/LibMV.xcodeproj/
-libs/glog/glog.xcodeproj/
-libs/gflags/gflags.xcodeproj/
-libs/qhttpserver/qhttpserver.xcodeproj/
-libs/qhttpserver/src/qhttpserver.xcodeproj/
-Natron.xcodeproj/
-Project-xcode-breakpad.xcodeproj/
-Natron-bin.xcodeproj/
-NatronRenderer-bin.xcodeproj/
-NatronRenderer.xcodeproj/
-NatronCrashReporter.xcodeproj/
-NatronRendererCrashReporter.xcodeproj/
-BreakpadClient.xcodeproj/
-tools/normalize/normalize
-Tests.xcodeproj/
-HostSupport.xcodeproj/
-Gui.xcodeproj/
-Engine.xcodeproj/
-Project.xcodeproj/
-natron-python.xcodeproj/
 *.sln
 *.xcworkspace
 *xcuserdata
@@ -248,53 +218,76 @@ bigobjects.txt
 bigtosmall.txt
 
 
-tools/normalize/normalize
+#Documentation/source/_group*
+#Documentation/source/_prefs.rst
+#Documentation/source/plugins
+.qmake.stash
 App/Natron
+BreakpadClient.xcodeproj/
+Documentation/html
+Documentation/pdf
+Engine.xcodeproj/
+Gui.xcodeproj/
+HostSupport.xcodeproj/
+Natron-bin.xcodeproj/
+Natron.xcodeproj/
+NatronCrashReporter.xcodeproj/
+NatronRenderer-bin.xcodeproj/
+NatronRenderer.xcodeproj/
+NatronRendererCrashReporter.xcodeproj/
+Project-xcode-breakpad.xcodeproj/
+Project.xcodeproj/
 PythonBin/natron-python
-<<<<<<< HEAD
-.qmake.stash
-=======
 Renderer/NatronRenderer
 Serialization.xcodeproj/
 TODO.txt
 TestImages
 TestWrite
 Tests.xcodeproj/
+Tests.xcodeproj/
 Tests/Plugins
 Tests/Tests
 breakpadclient.pri
 breakpadpro.pri
 config.pri
 google-breakpad/
 libs/ceres/ceres.xcodeproj/
+libs/ceres/ceres.xcodeproj/
 libs/gflags/gflags.xcodeproj/
+libs/gflags/gflags.xcodeproj/
+libs/glog/glog.xcodeproj/
 libs/glog/glog.xcodeproj/
 libs/hoedown/hoedown.xcodeproj/
+libs/hoedown/hoedown.xcodeproj/
+libs/libmv/LibMV.xcodeproj/
 libs/libmv/LibMV.xcodeproj/
 libs/libtess/libtess.xcodeproj/
+libs/libtess/libtess.xcodeproj/
+libs/libtess/tess.xcodeproj/
 libs/libtess/tess.xcodeproj/
 libs/openMVG/openMVG.xcodeproj/
+libs/openMVG/openMVG.xcodeproj/
+libs/qhttpserver/qhttpserver.xcodeproj/
 libs/qhttpserver/qhttpserver.xcodeproj/
 libs/qhttpserver/src/qhttpserver.xcodeproj/
+libs/qhttpserver/src/qhttpserver.xcodeproj/
 libs/yaml-cpp/yaml-cpp-natron.xcodeproj/
 natron-python.xcodeproj/
 natron-python.xcodeproj/
+natron-python.xcodeproj/
 ofxTestLog.txt
 test_dot_generator0.jpg
+tools/docker/natron-sdk/Dockerfile
+tools/docker/natron-sdk/build-Linux-sdk.sh
+tools/docker/natron-sdk/common.sh
+tools/docker/natron-sdk/compiler-common.sh
+tools/docker/natron-sdk/include/
+tools/docker/natron-sdk/pkg/
+tools/normalize/normalize
+tools/normalize/normalize
 tools/normalize/normalize
 tools/normalize/normalize
 tools/normalize/normalize.xcodeproj/
 tools/utils/generateGLIncludes
 tools/utils/generateGLIncludes.pro.user
 tools/utils/generateGLIncludes.xcodeproj/
-tools/docker/natron-sdk/build-Linux-sdk.sh
-tools/docker/natron-sdk/common.sh
-tools/docker/natron-sdk/compiler-common.sh
-tools/docker/natron-sdk/Dockerfile
-tools/docker/natron-sdk/include/
-<<<<<<< HEAD
->>>>>>> 44159ec4c... tools: add natron-sdk docker image tool
-=======
-tools/docker/natron-sdk/pkg/
-
->>>>>>> 3fe46c258... build-Linux-sdk.sh: [WIP] move each package to an individual file (for docker)