projects / satune.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 84245f9)
commit after resolving conflicts
authorHamed <hamed.gorjiara@gmail.com>
Thu, 15 Jun 2017 19:56:05 +0000 (12:56 -0700)
committerHamed <hamed.gorjiara@gmail.com>
Thu, 15 Jun 2017 19:56:05 +0000 (12:56 -0700)
.gitignore patch | blob | history

diff --git a/.gitignore b/.gitignore
index 50857424b9e3d1692ec01e51c4bb1ff76457c06b..39d4e58713ed3c50a2fe63da66b54db65cef26b7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ nbproject/
 #Ignoring binary files
 src/bin/
 src/lib_cons_comp.so
+/src/mymemory.cc
SATune Repository