Merge lp:~sampablokuper/mnemosyne-proj/gitignore into lp:~peter-bienstman/mnemosyne-proj/trunk

[sampablokuper]

Fix bzrignore/gitignore issue discussed at https://groups.google.com/forum/#!topic/mnemosyne-proj-devel/iR2hl9BHSJo

=== modified file '.bzrignore'
--- .bzrignore	2016-04-10 14:02:22 +0000
+++ .bzrignore	2016-06-16 15:34:54 +0000
@@ -1,96 +1,190 @@
-# Created by https://www.gitignore.io/api/android,intellij
+# Ignore files and directories created by the following commands:
+# 
+# `make`
+# `make setup`
+# `make test`
+# `make coverage`
+
+.coverage
+dot_sync_A/
+dot_sync_B/
+dot_sync_C/
+dot_sync_client/
+dot_sync_server/
+dot_test/
+htmlcov/
+mnemosyne/Mnemosyne.egg-info/
+mnemosyne/bin/
+mnemosyne/dot_mnemosyne2/
+mnemosyne/include/
+mnemosyne/lib/
+mnemosyne/local/
+mnemosyne/mnemosyne/**/*.pyc
+mnemosyne/mnemosyne/pyqt_ui/mnemosyne_rc.py
+mnemosyne/mnemosyne/pyqt_ui/tmp
+mnemosyne/mnemosyne/pyqt_ui/ui_*
+mnemosyne/mo/
+mnemosyne/openSM2sync/**/*.pyc
+mnemosyne/tests/**/*.pyc
+mnemosyne/tests/files/basedir_to_merge/to_merge.db-journal
+outside.db
+outside.db-journal
+
+
+# Created by https://www.gitignore.io/api/android,emacs,intellij,vim
 
 ### Android ###
 # Built application files
-**/android/**/*.apk
-**/android/**/*.ap_
+*.apk
+*.ap_
 
-# Files for the Dalvik VM
-**/android/**/*.dex
+# Files for the ART/Dalvik VM
+*.dex
 
 # Java class files
-**/android/**/*.class
+*.class
 
 # Generated files
-**/android/**/bin/
-**/android/**/gen/
-**/android/**/out/
+bin/
+gen/
+out/
 
 # Gradle files
-**/android/**/.gradle/
-**/android/**/build/
+.gradle/
+build/
 
 # Local configuration file (sdk path, etc)
-**/android/**/local.properties
+local.properties
 
 # Proguard folder generated by Eclipse
-**/android/**/proguard/
+proguard/
 
 # Log Files
-**/android/**/*.log
+*.log
 
 # Android Studio Navigation editor temp files
-**/android/**/.navigation/
+.navigation/
 
 # Android Studio captures folder
-**/android/**/captures/
+captures/
 
 # Intellij
-**/android/**/*.iml
+*.iml
+.idea/workspace.xml
 
 # Keystore files
-**/android/**/*.jks
+*.jks
 
 ### Android Patch ###
-**/android/**/gen-external-apklibs
-
+gen-external-apklibs
+
+
+### Emacs ###
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+# flymake-mode
+*_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
 
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
-**/android/.idea/workspace.xml
-**/android/.idea/tasks.xml
-**/android/.idea/dictionaries
-**/android/.idea/vcs.xml
-**/android/.idea/jsLibraryMappings.xml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
 
 # Sensitive or high-churn files:
-**/android/.idea/dataSources.ids
-**/android/.idea/dataSources.xml
-**/android/.idea/dataSources.local.xml
-**/android/.idea/sqlDataSources.xml
-**/android/.idea/dynamic.xml
-**/android/.idea/uiDesigner.xml
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
 
 # Gradle:
-**/android/.idea/gradle.xml
-**/android/.idea/libraries
+.idea/gradle.xml
+.idea/libraries
 
 # Mongo Explorer plugin:
-**/android/.idea/mongoSettings.xml
+.idea/mongoSettings.xml
 
 ## File-based project format:
-**/android/*.iws
+*.iws
 
 ## Plugin-specific files:
 
 # IntelliJ
-**/android/out/
+/out/
 
 # mpeltonen/sbt-idea plugin
-**/android/.idea_modules/
+.idea_modules/
 
 # JIRA plugin
-**/android/atlassian-ide-plugin.xml
+atlassian-ide-plugin.xml
 
 # Crashlytics plugin (for Android Studio and IntelliJ)
-**/android/com_crashlytics_export_strings.xml
-**/android/crashlytics.properties
-**/android/crashlytics-build.properties
-**/android/fabric.properties
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
 
 ### Intellij Patch ###
-**/android/**/*.iml
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+
+
+### Vim ###
+# swap
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
 

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2016-06-16 15:34:54 +0000
@@ -0,0 +1,190 @@
+# Ignore files and directories created by the following commands:
+# 
+# `make`
+# `make setup`
+# `make test`
+# `make coverage`
+
+.coverage
+dot_sync_A/
+dot_sync_B/
+dot_sync_C/
+dot_sync_client/
+dot_sync_server/
+dot_test/
+htmlcov/
+mnemosyne/Mnemosyne.egg-info/
+mnemosyne/bin/
+mnemosyne/dot_mnemosyne2/
+mnemosyne/include/
+mnemosyne/lib/
+mnemosyne/local/
+mnemosyne/mnemosyne/**/*.pyc
+mnemosyne/mnemosyne/pyqt_ui/mnemosyne_rc.py
+mnemosyne/mnemosyne/pyqt_ui/tmp
+mnemosyne/mnemosyne/pyqt_ui/ui_*
+mnemosyne/mo/
+mnemosyne/openSM2sync/**/*.pyc
+mnemosyne/tests/**/*.pyc
+mnemosyne/tests/files/basedir_to_merge/to_merge.db-journal
+outside.db
+outside.db-journal
+
+
+# Created by https://www.gitignore.io/api/android,emacs,intellij,vim
+
+### Android ###
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+
+# Keystore files
+*.jks
+
+### Android Patch ###
+gen-external-apklibs
+
+
+### Emacs ###
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+# flymake-mode
+*_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+
+
+### Vim ###
+# swap
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+