summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authoradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-06-02 22:41:57 +0000
committeradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-06-02 22:41:57 +0000
commitc9d8f10a2a361dd5dffa5d61b96bc96f0d50129d (patch)
treea2c949860fb01f2efb3dfd3b439a726a4e3ea753 /.gitignore
parentMerge branch 'master' into local-svn (diff)
parentnew cookie management system. That (hopefully) works well..;) (diff)
downloadrekonq-c9d8f10a2a361dd5dffa5d61b96bc96f0d50129d.tar.xz
Merge branch 'master' into local-svn
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@976901 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 5d84c45a..f4cc75e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-qtdemobrowser
releases
src/.ctagsdb
*.*~
@@ -6,6 +5,5 @@ src/.ctagsdb
.directory
*.tmp
build/
-qtcreator-build/
CMakeLists.txt.user
CMakeCache.txt