Skip to content

Commit

Permalink
Code review: 108730049: Fixing AUTHORS/ACK file and changing version …
Browse files Browse the repository at this point in the history
…numbers again to a dev trunk.
  • Loading branch information
kiddinn authored and joachimmetz committed Dec 31, 2015
1 parent bb45326 commit dbce181
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 9 deletions.
22 changes: 22 additions & 0 deletions ACKNOWLEDGEMENTS
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,24 @@ Thanks to contributors (alphabetically based on last name):
* Joaquin Moreno Garijo
* Parsers
* ASL
* BSM
* Cups IPP
* Mac AppFirewall
* Mac KeyChain
* Mac Securityd
* mac_wifi.log
* utmp
* utmpx
* SQLite plugins
* Skype
* Plist plugins
* Airport
* Apple Account
* Install History
* Mac User
* Software Update
* Spotlight
* TimeMachine
* David Nides (@davnads)
* Output modules
* 4n6time SQLite, with thanks to Eric Wong for assistance
Expand All @@ -61,7 +75,12 @@ Thanks to contributors (alphabetically based on last name):
* WinRar
* Francesco Picasso
* Parsers
* PopContest
* SELinux
* SkyDriveLog
* SkyDriveLogErr
* XChatLog
* XChatScrollBack
* Jordi Sanchez
* binplist
* object filter
Expand All @@ -78,6 +97,9 @@ Thanks to contributors (alphabetically based on last name):
* Android calls database
* Android sms database
* updates to the timezone transformation
* Petter Bjelland
* Parsers
* Firefox Cache

Test data:

Expand Down
14 changes: 8 additions & 6 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@
Google Inc. (*@google.com)
Kristinn Gudjonsson ([email protected])
Joachim Metz ([email protected])
Eric Mak ([email protected])
Elizabeth Schweinsberg ([email protected])
Keith Wall ([email protected])
Brian Baskin ([email protected])
David Nides ([email protected])
Dominique Kilman ([email protected])
Elizabeth Schweinsberg ([email protected])
Eric Mak ([email protected])
Francesco Picasso ([email protected])
Joaquin Moreno Garijo ([email protected])
Keith Wall ([email protected])
Marc Seguin ([email protected])
Oliver Jensen ([email protected])
Dominique Kilman ([email protected])
Brian Baskin ([email protected])
Marc Séguin ([email protected])
Petter Bjelland ([email protected])
6 changes: 3 additions & 3 deletions plaso/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '1.1.0'
__version__ = '1.1.1'

VERSION_DEV = False
VERSION_DATE = '20140605'
VERSION_DEV = True
VERSION_DATE = '20140606'


def GetVersion():
Expand Down

0 comments on commit dbce181

Please sign in to comment.