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

Merge branch 'master' of http://iffwww.iff.kfa-juelich.de/~wuttke/frida2 

Conflicts:

	pub/CHANGELOG
parents ed74175e 5da42628
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
pub/CHANGELOG
+ 4
− 0
View file @ 7905af7d
<<<<<<< HEAD:pub/CHANGELOG
- function names -> "clear", "remove" for compatibility with STL
=======
- correct frida.ini location
>>>>>>> 5da426283e416454fa6909d93987ee4f7cdb9fdc:pub/CHANGELOG
Release 100424:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment