Skip to content
Snippets Groups Projects
Commit c55912bf authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

merged

parent 7905af7d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 5 deletions
pub/CHANGELOG
+ 2
− 5
View file @ c55912bf
<<<<<<< HEAD:pub/CHANGELOG
- function names -> "clear", "remove" for compatibility with STL
=======
- correct frida.ini location
>>>>>>> 5da426283e416454fa6909d93987ee4f7cdb9fdc:pub/CHANGELOG
- function names -> "clear", "remove" for compatibility with STL
Release 100424:
......@@ -12,4 +9,4 @@ Release 100424:
- make install now installs man page and aux files (/usr/local/share/frida)
- executable renamed frida2 -> frida
Change log started 7apr10
\ No newline at end of file
Change log started 7apr10
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment