Merge remote branch 'upstream/master'

Conflicts: mbus/mbus-protocol.c
2012-04-22 19:37:55 +02:00
parent 39e7b64ff4 281394c092
commit df06b93e97
8 changed files with 177 additions and 51 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,7 @@
+.project
 *~
 *.o
 *.so
+*.la
 *.lo
+.libs/