e7281e0085
Merge branch 'master' into module-enumdb
...
Fixing up the merge conflicts caused mostly by the CRLF's (fixed in the
parent commit to this one), and probably by failing to merge from
master on sectorix's side.
Conflicts:
modules/post/windows/gather/enum_db.rb
2012-09-26 08:42:24 -05:00
5bd39536a2
Reformatting with Unix linefeeds.
...
For the curious, I like this procedure a lot, it's my new favorite:
http://vim.wikia.com/wiki/File_Format#Converting_the_current_file
2012-09-26 08:40:50 -05:00
3efe9ac761
removed dev comments
2012-09-26 13:37:17 +01:00
f51f4c1e6a
added support for oracle 11g XE
2012-09-26 13:28:16 +01:00
93dd96d4d3
fixing variable name
2012-09-25 15:40:12 +02:00
4cd244693f
Tabs
2012-09-24 19:13:44 -05:00
cb099d3431
fixing and cleanup for pull #802
2012-09-24 20:34:26 +02:00
b1226ab87c
mysql search config + less verbose
2012-09-21 20:01:32 +01:00
Tod Beardsley