--- a/.hgignore	Tue Oct 09 01:08:40 2012 +0200
+++ b/.hgignore	Sat Oct 27 02:13:23 2012 +0200
@@ -1,10 +1,53 @@
 syntax: glob
-bin/*
-R.java
-doc/javadoc
+# generated files
+bin/
+gen/
 src/com/beem/project/beem/service/aidl/*.java
-gen/*
+doc/javadoc
+
+# Local configuration file (sdk path, etc)
 local.properties
-**~
-**/.*.sw?
+
+# built application files
+*.apk
+*.ap_
+
+# keystore
+*.keystore
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# maven output folder
+target
+
+# Eclipse project files
 .classpath
+.project
+.metadata
+.settings
+
+# IntelliJ files
+.idea
+*.iml
+
+# OSX files
+.DS_Store
+
+# Windows files
+Thumbs.db
+
+# vi swap files
+.*.sw?
+
+# backup files
+*.bak
+*~
+
+# maven eclipse files
+.externalToolBuilders
+maven-eclipse.xml
+