[backfire] merge r24238 & r26785
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 29 Apr 2011 15:15:36 +0000 (15:15 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 29 Apr 2011 15:15:36 +0000 (15:15 +0000)
SVN-Revision: 26786

.gitignore

index e68b0d9f0845618432a8855a70676cc17a680ca7..f9458c71fded8d108f0c0c8b868568c6b009d485 100644 (file)
@@ -15,3 +15,6 @@
 /files
 /package/feeds
 /package/openwrt-packages
+*.orig
+*.rej
+*~