.gitignore updates

 * android/ - native code builds are now under 'native', not 'build'.

 * / - Add *.user files (for example CMakeLists.txt.user used by Qt
Creator).

Change-Id: I67ada8033ba5a53d031807a85508d58ea895cb50

diff --git a/.gitignore b/.gitignore
index 2f836aacf266b3e7fc17ec2d8a99aa68c904c1b9..8c33fafc50dd8cde6e7ddc39586837588648193d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *~
 *.pyc
+*.user

diff --git a/android/.gitignore b/android/.gitignore
index c8aa7c424c095f638cf37d0059df770d57110b11..c26052ab924601e2d34fb52497d4b3a2053a9d89 100644 (file)
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -9,4 +9,4 @@ proguard.cfg
 project.properties
 proguard-project.txt
 debug
-build
+native