Merge 47449e6238 into fb9bb64689

2012-03-27 20:31:07 -07:00 · 2012-03-27 20:31:07 -07:00 · 7464806f92
parent fb9bb64689 47449e6238
commit 7464806f92
3 changed files with 0 additions and 23 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,23 +0,0 @@
-favicon.*
-.htconfig.php
-\#*
-include/jquery-1.4.2.min.js
-*.log
-*.out
-*.version*
-#favicon.*
-#home.html
-#addon
-*~
-
-#ignore documentation, it should be newly built 
-#doc/api
-
-#ignore reports, should be generted with every build
-report/
-
-#ignore config files from eclipse, we don't want IDE files in our repository
-.project
-.buildpath
-.externalToolBuilders
-.settings
--- a/smiley_pack/.smiley_pack.php.kate-swp
+++ b/smiley_pack/.smiley_pack.php.kate-swp
--- a/smiley_pack/icons/disgust/fartblush.gif
+++ b/smiley_pack/icons/disgust/fartblush.gif