labofsahil/github-event-dataset-2012 huggingface dataset:
initial work on grammar based off grammar described in ECMA-262, 5th ed and JavaScript grammar provided by David Majda
set it to depth 11
09/06/2012 - 2

Pretty much Final version unless any bugs are found :-)
- Fixed the food from becoming 9 after swapping sides
- Fixed Tournament, fully working!
- Prevented more than 16 players from playing
- Changed world generator so that it doesn't display an error message if
it can't produce a world. Instead it just keeps trying until it does
- Got rid of System.out.prints from the world when the sides are swapped
Get rid of async option in servers
Update README formating (again)
made API calls DRY
using Card class
Changing data details layout
Added formatting for HTML links
Added ctcp parsing framework (needs more work). The bot now responds to VERSION queries.
Changes to the base template
Changes to the base template
rename hxml snippets
Basic type defs.
Merge branch 'master' of github.com:jdreux/streamUR
added missing EnvironTests.cs to unittests project and fixed kb namespace statement
add ability to open VMs by filepath
We don't need to pass along the intended SZS status at this point.
Quick mode replaces thorough mode.
finishing rake tasks step 1
Event model class; Parse response from Facebook and create events list.
[Finder] Added native sorting support to gnu find adapter.
Cambios en eurotyre
Added logo for rodaben
Update acore.
Add new RPC "lockunspent", to prevent spending of selected outputs
and associated RPC "listlockunspent".

This is a memory-only filter, which is empty when a node restarts.
Make GetDataDir return absolute paths
Merge pull request #1133 from sipa/abspath

Make GetDataDir return absolute paths
Merge pull request #1140 from jgarzik/sign-compare

Address many more sign comparison warnings
Canonicalize nFile usage, using zero for 'null' value, rather than -1

It is defined as a 'unsigned int' and our first valid value is 1.
bump to 7.2.0
Initial default ordering working
WIP DR gates embedded in x-asis of graph
index_brand
3rd

..
Changing datasource
Corregido el error 404 del favicon
Add a new helper method to join a conference, and modify the say method to accept a stanza type.
use VirtualEnv
Cleaned up the popup code, with proper constants, accessor-methods etc
Switched to using Ciaran's popup menu
Added a documentation popup, this works by having a key called 'documentation' in the item, if there is no such key, the key 'fallback' containg an URL will be looked up, results are expected to be in plist format
add the missing files
Add missing removeObserver: in dealloc.
Always close documentation popup when selection changes. Keep selection if possible when filterering. Send selection changed even if selection changed to nothing
Try to keep the selected items position in the menu when filtering
fix sync issues, which caused index out of bounds errors, by moving calculation of offsets etc into the drawRect method
Don't keep selection when backtracking, if the selection is the first row
Fixing the sync issues broke the maintain position feature, reimplement that
Change comment to better reflect new algorithm
Fixing the sync issues broke the hide documentation popup if no items to show
Fix issue with scroll wheel (magic mouse).

Seems the magic mouse triggers a lot of near zero distance scroll wheel events, both negative and positive, when scrolling. This would cause the selection to act very irrational.
Make refined completion menu compile with TextMate build framework
Add a scm commit window to tm_dialog
Remove unused code
Don't reimplement super class methods
Switch int -> NSInteger, float -> CGFloat
Remove unnecessary code
Fix memory issue
fixed unlink
Added new sqlfile
removed ruby-end mode because it messes with show-args
Modify poster/__init__.py, set relative path to recently included poster module
Remove copied libavro (adding as a submodule)
Add libavro as a submodule
Prefix assignment feature added.
README tweaks
More README tweaks
Version bump for new prefix feature
Move the socket to a specific statsd adapter, for clarity, and future expansion
Use facets to symbolize hash in configuration.
Remove mocha and rcov. Use rspec mock and stub.
Amends to adapter testing
Simple test for monitor extension
Tweaks to tests.
Bulk DSL added to allow multiple metric registrations in a single request.
Comment tweak
Updated README for bulk method
Merge remote-tracking branch 'upstream/master'

Conflicts:
	fozzie.gemspec
	lib/fozzie/configuration.rb
Add support for "input" event handlers

This is an HTML standard event, like "change".
https://developer.mozilla.org/en/DOM/window.oninput
http://www.whatwg.org/specs/web-apps/current-work/multipage/common-input-element-attributes.html#event-input-input
Updated readme to include delete.
messing with application.rb to fix heroku issue
1142 Kavitha/Yekkanti- Migrated create_cusotm_fields from webrat to capybara
#1142| Yekkanti|Kavitha Migrated reorder_fields to capybara
#1142 Yekkanti|Kavitha Migrated disable_enable_form_fields to capybara
1142 Kavitha/Yekkanti Migrated add_custom_fields_to_form_section to capybara
#1142 Yekkanti|Kavitha Migrated edit_custom_fields to capybara
#1303 Yekkanti|Kavitha Migrated manage_users to capybara
Merge branch 'rails30_upgrade' of github.com:jorgej/RapidFTR into rails30_upgrade
Initial build for gallery-node-autogrow module.
transferred from nathansuniversity/math to mathpeg repo
Added Images into Project, Finished Woman Audio, Added Reverb
Add new hook for directory matching
Fire directory match hook
Sketch load_tests package handling
Add test files for load_tests cases
Update service-collect-scripts/metrics-openfiles.rb
Port to PC-BSD 9 (almost).
created polling behaviour
hmm
better
refactor to use new behaviour
f
editted wording
Updated lang to not carp when language paths are empty or don't exist.
Use local season cover images
Import textproc/ebook-tools version 0.2.2
Import editors/gnotepad+ version 1.3.3_8
correct number for summon/primo comparison example
Updated description to address Greg's comment.
Re-wrote networking receive code and cleaned up demo form code.
Cleaned networking code more (removed commented-out old code).
first commit
Merge branch 'master' of https://github.com/jshea/phonebook
Fixing a non-deterministic text failure
Updated to latest (non-Elpa) version of yasnippet.  Added my own js-mode yasnippet bundle.
msgpack-rpc based client merged
msgpack-rpc based rpc-server merged
changed: server_helper::start() is template function.
changed: all server, keeper changed to msgpack-rpc base

+ changed: rpc_server2 accept pfi::common::function instead of
  mp::function to simplify server_util/server_helper.
changed: obsolate pfi-rpc based code
changed: rename msgpack-rpc based classes
fixed: license notice fixed
fixed: --checkall passed

+ fixed: src/cmd/wscript typo
+ fixed: classifier_client compile error
+ fixed: classifier_test, linear_mixer_test failure
+ modified: rename keeper's random_proxy<...> to
  random_proxy0<...>, random_proxy1<...> ...
+ modified: rpc_response_t definition reverted.
  ( Reason: Building rpc_response_t by hand with ctor
  rpc_response_t(future) is too difficult )
Merge branch 'feature/msgpack-rpc' of github.com:y-oda-oni-juba/jubatus into feature/msgpack-rpc
changed: rename msgpack-rpc -> jubatus_msgpack-rpc
merged: branch 'develop'

+ fixed: rpc_response: wrong freeing msgpack zone object
Remove libevent dependency
add async option to juba*keeper
Fixed SIGCHLD handling of juvabivosr to consider zombie process

fixes #53
* First integration of ScoreLoop
* First scoreloop integration
* Change target for scoreloop integration
* Integration of scoreloop
fix scaladoc
Merge pull request #211 from julienrf/enumerator-flatmap

Add Enumerator#flatMap
fix a chunking bug
added recover method to promise
Merge pull request #201 from julienrf/querystringbindable-list

Provide a QueryStringBindable[List[T]]
JSONP Support
Fixes bug where img elements without the realSrcAttribute go missing in Firefox
Revert "Moving documentation parents one level down for DoneJS docs"

This reverts commit 947f427b460c0db8b82d7e7ac43b7420508fd257.
Adding can/util/object to libraries so observe.backup and fixture plugins work
fixture plugin ready
Cherry picking route changes from donejs branch
Removing can/util/object from libraries; can.fixture and can.observe.backup plugin will include can/util/object when being built
Adding can.fixture plugin to 1.0b2 and updating can.observe.backup
Adding missing can.control.view plugin
Fixtures work with can.Model
can.fixture.make documentation and include can/util in main tests
Fixtures always need type
Added documentation for can.Deferred.prototype.fail
Fixture tests work with all libraries
jQuery specific test
Merge with branch master
Add fixtures to main tests
Archive the repository instead of cloning it so that it works with CI shallow copy
Added debugging mode to the protocol

Allows inspection of message data. It is off by default since it consumes
additional bandwidth, but it can be turned on using the net_debugMode option
in manaserv.xml.

Currently the option only affects outgoing data for each host individually.
In particular, enabling this debug mode for the server does not automatically
make the client annotate its messages.

Reviewed-by: Erik Schilling
Small GCC 4.7 compile fix

Not entirely according to the standards since this is a C99 header,
but that's better than not having it compile at all, or switching
it entirely over to C++11 mode just now.
Fixed type of returned value from MapReader::readMap

GCC 4.7 warns about this, yay.
Some small optimizations in Lua helper functions

Reviewed-by: Ben Longbons
Don't send NPC text as fixed-length string

This is intended to be used only when the string length is known. The
client was deriving the length from the remaining amount of data in the
message, but that doesn't work in the new 'debug mode' of the protocol.

Reviewed-by: Ben Longbons
Removed no longer needed code

I forgot to remove this during my special cleanup

Reviewed-by: bjorn.
Fixed handling of skills

 - Removed possibility of skills getting mixed with attributes
 - Made the server sending the level of the current skill on exp change
   (currently the client could calculate it itself, but it allows more
    flexibillity in future this way)
 - Fixed reading of skills out of the database
   (for some reason the status effects were added as skills)

** Needs clientside patch as well (coming soon) **

Reviewed-by: Bertram.
Collisiondetection: Removing commented code.

Reviewed-by: Ablu
little cleanups
reorder bullets on why slide
CLI version updated. buildCLI.xml build file added. Small modifications to acomodate the CLI version
Improved design of canvas objects
camera autofocus
Testejä ja refaktorointia
Add partial french translation
Fixed stupid bugs. Still can't figure out why the results diverge so much. Probably another bug.
Merge branch 'master' of github.com:kaewgb/ca-nbody
Empty project created
Add Readme.md to the project
Fix assembly info
add nunit package
Lololtest
clean/calendar test
removed redundant play button removal 
comment adjustments disable adaptive to test on desktop 
set background thumbnail background to black 

- avoids showing other players underneath when you exit native
don't call embedPlayerHTML to update poster, 

- whites space fixes
- always call update poster in changeMedia sequence
fixed iPhone html poster image on change media
improved accuracy of replay count

- moved donePlayingCount to interface done time 
updated test file for auto continue
fixed setting values for prettyconfig secondary plugins
fixed window scroll position on orientation change
add mw.KAds dependency for bumper plugin
updated arrow images.
bumped revision to 1.6.11.11
Vastly improved code quality, reorganized some stuff, and added copyright to some files
add Constructors::createInteger to wrap Integer::Container, #69
Further optimize operator==.
Related to #112.
Changed tagline
Added Dropbox account under required technology
Moved remaining policy information over from Evernote
removing easy clipboard accessess.. :)
Move members into the Kelpie namespace to make overriding them cleaner.
added sniff favicon
added try/excepts for numpy/numpydoc importing
サマリの追加
複数シートの対応
Use my badwolf fork
hop - about task -> 'hello'

also inlined it
hop -> dartdoc -> include source branch and SHA in commit message
AnsiColor: added magenta
Docs generated for refs/heads/master at 988eee1
Docs generated for refs/heads/master at 0e1d77d
add bootstrap files to public folder
update submodules
modernizing project
* defined various build and output directories
* defined custom make targets
* switched to using g++ as the compiler and defined custom compiler and linker flags
* fixed code to not produce any warnings
removing misnamed directory
updated canvas.js
merging
[maven-release-plugin] prepare release mockins-0.2
Прикрутил markdown к проектам.
Give up fixing Table
update lazy load module demo
UNIX line endings and 2 space soft tabs. Oh, Windows.
Flags: all flags completed
Typo fix in docs/doctools
kill unused function
'Features' section in README
Add a class of image files not directly supported by LaTeX.

Previously, all image files were classified into groups of files supported
by latex and those supported by pdflatex.  This change also defines files
that are not directly supported by either (and therefore always have to
be converted).

Also added svg, tiff, and gif files to the list of those supported.
Add test for various image types.
Delete unnecessary files
Revert "Adding Knowing logo to sources in"

This reverts commit f9e7bfcc7dc739397e60ae15d82ff309679d25d9.
Added code to transform a dependency graph between active and passive forms.
Added the ability to distinguish active and passive extraction instances.
Added an active/passive conversion to the gui.
Specify that ollie takes pre-sentenced input by default.
Use latest nlptools.
Cleaned up usage message.
- Implemented finite looping and fading support
- Version is now 1.171
First try at making ForeignKey virtual.
Fixed an ugly app loading loop triggered by ForeignKey initialization.
Fixed ForeignKeys by introducing a field_prepared signal

Still doesn't work with OneToOneFields for some unknown reason.
Fixed auxiliary field creation for O2O fields and database creation.

Ditched mark_as_prepared in the process.
Rewritten RawQuerySet.columns not to call Field.get_attname_column directly.
Made auxiliary fields work to the point that the test suite can actually run.
Cleaned up the index creation code.
Fixed a few hundred test failures caused by auxiliary field nullability and database creation on Postgres.
Fixed foreign key references in database creation.
Actually fixed database creation on Postgres.
Fixed the creation counter for auxiliary fields.
Updated model_package test case to auxiliary fields.
Fixed RawQuerySets to only handle concrete fields.
Fixed handling of ForeignKey.default.
Fixed QuerySet iteration with select_related and aggregation.
Fixed QuerySet.bulk_create by making it use opts.local_concrete instead of local_fields.
Fixed deferred field loading except for two test cases.
Fixed select_related.
Fixed concrete inheritance of models containing lazy ForeignKeys by invalidating field caches even for subclasses.
Fixed an issue where ForeignKeys could be deferred using ``only`` but not using ``defer``.
added recipientList test case
- Fixed the gesture_hash.txt list. Didn't realize I had screwed up the last list.
1. Added Test\n2. Added requirements.txt\n 3. Added .travis.yml\n 4.Added AUTHORS.rst
added *.swp to .gitignore
added errorhandling for getStreamTime()
style updates

add some more default styles for some lesser used elements
Pridavani knih
exporting interal classes
Add op_version as a member of vme struct & move definition to header.
Set op_version as 1 for every member in the vme map.
TODO: Bump op_version for features introduced after 3.3.0

Change-Id: Ifb9c3fabf3adb0d9ba0170e3a96606b4da72f85d
only run analytics in production
fixed tests to account for capitalized language as well as added expires to fixture
small changes to bot
ホームディレクトリ以下のbinをPATHに追加
開発サーバーとrsyncするキーマップを追加
minor refactoring of TransactionProcessor
ec2
ec3
Ignore unsupported messages in public chat

Reviewed-by: Erik Schilling.
Made your own message logged in chat tab more clear.
Remove ChangeLog.
Remove check for ENABLE_MANASERV and MANASERV_SUPPORT, since it should always be enabled.
Remove support for tmwathena.
Add *.swp to .gitignore.
Merge branch 'manaserv'
Fix the layer problem with an ugly way.

Will try another more elegant fix way in anthor branch.
Fix warnnings for layer problem fix.
added syntax highlighting to the readme

Signed-off-by: syntaqx <syntaqx@gmail.com>
Merge pull request #688 from syntaqx/readme

README updates
Changed .gitignore in session to ignore all contents

Signed-off-by: Ben James <in@benjam.es>
Merge pull request #711 from benjam-es/patch-1

Changed .gitignore in session to ignore all contents
change file permission

http://blog.lesc.se/2011/11/how-to-change-file-premissions-in-git.html
Added support for collapse map
Updated license to AGPL
Merge pull request #21 from larsbutler/update-license

Updated license to AGPL

[r=trivial]
Merge pull request #19 from acerisara/collapse-map

[r=gvallarelli][f=922501]
Added siteModel nrml schema shard.
Added more restrictions and some doc to the site model schema.
Added site model parser.
Fixed a stupid merge error.
Merge pull request #25 from larsbutler/site-model

Add siteModel nrml schema shard

[r=arbeit] [f=*987827]
pep8
Moved schema path utility function to utils module
Merge pull request #26 from larsbutler/site-model-parser

Site model parser

[r=arbeit] [f=*987827]
Better test file path handling (doesn't break when nrml is used as a submodule).
Merge pull request #28 from larsbutler/trivial-better-test-file-path-handling

Trivial: Better test file path handling

[r=trivial]
Add the possibility to define sphere center
If the lod count <= 0 when finishing a mesh, the mesh is cleared.
if the MeshData doesn't contains any LOD, the method
trianglesCount return 0 instead of an assertion.
Add the possibility to get GLC_Mesh set of primitives id.
(This new method can be used with GLC_RenderingProperties)
Improve setMatRot method
 - Handle correctly inversed vector.
Add the possibility to know if this manager is empty
Add the possibility to know if this manager is empty
Use the new GLC_Matrix emprovement.
Add the possibility to set this plane normal.
(Not tested yet)
Added prettyfaces patch for oracle 12c. prettyfaces version is
3.3.4-SNAPSHOT. 
Configured for oracle 12c deployment
remove #, change auth
Merge branch 'dev' of git://github.com/lblsa/showstaff into dev
remove hot_auth_fix
Merge pull request #32 from vinilzen/dev

Dev
Merge branch 'work' into develop
Merge branch 'develop' into release
Merge branch 'release'
Merge branch 'master' into work
Incremented the version number, and added dork 0.0.3 as a devDep.
Add list command to server.
temporarily change loading mechanism, to enable Firebug tracing
First attempt for time span selection, but the box is not drawn inside the chart
Re-enable javascript loading for monitor tab
Time span selection somewhat works, not fit yet
Send time span selection to log analysis dialog
Fix conflicts
Fix div width on leftwards drag
Fire mouseup event from chart, not from overlying div, doesn't work in IE
Jqplot profiling chart for query analysis in Status>Monitor
Fix unwanted error on mouseup
Merge branch 'QA_3_5-jqplot' of git://github.com/lem9/phpmyadmin into QA_3_5-jqplot
Left in 2548043adf32b8c8add18079
Fix time span continuation on to adjacent chart
Add custom tooltip to monitor charts
fix for end_time less than start_time
Remove Highcharts library and dead code still using it
Fix time formatting in tooltip
Merge branch 'QA_3_5-jqplot' into QA_3_5
Fix jqplot charts display in IE versions less than 9
Merge branch 'QA_3_5-jqplot' into QA_3_5
Kill unused params from the init

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Notify parent about RT(C)P physical parameters

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Fix typo

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Don't shadow variables

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Fix c/p typo

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Making OPTPFD safe
Merge branch 'master' of github.com:lemire/FastPFor
montando estrutura zetec com less
Change test

Testing Hello World text chaged to First commit
修改压缩参数，提高压缩比
增加Server和Client目录
Merge branch 'master' of git://github.com/lhavelund/r-wow
mod icons background positions
Merge branch 'master' of git://github.com/lhavelund/r-wow
shaded icon test
Various changes needing review
Fix typos in ngs-clip-atail
Win32 CryptoAPI and CNG support for SHA1
Remove git_hash_ctx_new - callers now _ctx_init()
move hash library func ptrs to global global
unload dll / destroy hash ctxs at shutdown
filebuf now has a git_hash_ctx instead of a ctx*
Merge pull request #1055 from ethomson/sha1_win32

Win32 CryptoAPI and CNG support for SHA1
Fix function name and add real error check

`revwalk.h:commit_lookup()` -> `git_revwalk__commit_lookup()`
and make `git_commit_list_parse()` do real error checking that
the item in the list is an actual commit object.  Also fixed an
apparent typo in a test name.
tests-clar/repo: fix unused warning

ifdef GIT_WIN32 helper unposix_path() to avoid unused-function warning
on non-Windows systems.

Signed-off-by: schu <schu-github@schulog.org>
Redesigned internal URI represention.
Better serialization of documents.
Listener now in completely separate thread.
Autodoc commit for master/bd6315b2, 1.0.x/454b66f7
ISSUE 96: (in liebke's branch) The clojure compiler was confusing the
'filter' parameter with the clojure.core filter fn. I simply renamed the
argument to 'filter-fn' and updated the code using it.
Merge pull request #98 from MarkSwanson/group-on-filter-fn

ISSUE 96: (in liebke's branch) The clojure compiler was confusing the
README.rst:  Added info about termio.py and terminal.py
Added support for less files
Corregido algunos problemas de alineación y css
Small update to backend
Tentatively begin styling pieces of the entries.
增加添加和删除会员级别的功能。添加功能未完成
Testing by creating git submodule, bringing in spec config.
GMM working
GMM working
implemented basic client/processor
Small changes, translate
Ignore old chache files
Added missed Gram matrix centering in hessian locally linear embedding
Changed include format to angle braces and made various cleanups
cosmetic change in zsh prompt
Fourth implementation of HelloWorld from L.
界面更新
Merge branch 'develop' of https://github.com/lnczx/lnc-hj-os into develop
1. 提案流程M层和d层的简单实现；

Signed-off-by: anlicheng <244108715@qq.com>
add split screen 'V' for futur two player race
usiung SocketIO
Fixed download button for iOS
LC_ALL
fixup! ol-pkg
Refactors and adds tests.
Updates version to 0.2.
Updates version to 0.3-pre.
fixes individuals with V-level mgr getting emailed, and take out summary
from emails to protect secure bugs
email individuals who's managers are V-level, but who are not in the
managers list yet
fix for emails when only one bug assignee (still cc the mgr)
Only redirect getmemorypool to submitblock if the parameter is a string; otherwise, ignore it (for forward compatibility)
Added some notes to start.
Luke: initial commit
Panic Fix on Blog Model field names SECOND ATTEMPT
QDropbox::requestTokenFinished() was emitted when access token was requested.

Signed-off-by: lycis <daniel@deder.at>
*) 解决关闭时work_service提前delete造成的崩溃现象
Use forward-declaration in kwalletstore.h
PlainStore now works.
Merge pull request #18 from Amesists/master

PlainStore works now
	modified:   daemon/daemon.cpp
	modified:   daemon/service.cpp
	modified:   daemon/service.h
	modified:   data/testapp
	modified:   include/app.h
	modified:   include/encrypter_p.h
	modified:   lib/app.cpp
	modified:   lib/encrypter.cpp
	modified:   lib/factory.cpp
	modified:   securestore/kwallet/kwalletstore.cpp
InfiTools 3.0
Working on garbage collector. Fixed literal value assignment.
powered by Titanium
что за х!
calling stream constructor
Revert "Prettified."

This reverts commit 2c58cb1cac5e22586d123d87173eb299cf9d75d7.
Prettified.
Fixed randomly failing logins

The salt was converted between encodings. This broke the "invalid" characters
in the salt (which simply contains random bytes).
Added a readByteArray function to messagein to allow reading raw strings.

Reviewed-by: bjorn.
[mr2160] move WorldPvP to mainstreem naming set. now I'm sure that the MT nothing better to do ...
[12097] Add Outdoor PvP placeholders and string texts

Conflicts:
	src/game/CMakeLists.txt
	src/game/Language.h
	src/game/OutdoorPvP/OutdoorPvP.cpp
	src/game/OutdoorPvP/OutdoorPvP.h
	src/game/OutdoorPvP/OutdoorPvPEP.cpp
	src/game/OutdoorPvP/OutdoorPvPEP.h
	src/game/OutdoorPvP/OutdoorPvPGH.cpp
	src/game/OutdoorPvP/OutdoorPvPGH.h
	src/game/OutdoorPvP/OutdoorPvPHP.cpp
	src/game/OutdoorPvP/OutdoorPvPHP.h
	src/game/OutdoorPvP/OutdoorPvPMgr.cpp
	src/game/OutdoorPvP/OutdoorPvPMgr.h
	src/game/OutdoorPvP/OutdoorPvPNA.cpp
	src/game/OutdoorPvP/OutdoorPvPNA.h
	src/game/OutdoorPvP/OutdoorPvPSI.cpp
	src/game/OutdoorPvP/OutdoorPvPSI.h
	src/game/OutdoorPvP/OutdoorPvPTF.cpp
	src/game/OutdoorPvP/OutdoorPvPTF.h
	src/game/OutdoorPvP/OutdoorPvPZM.cpp
	src/game/OutdoorPvP/OutdoorPvPZM.h
	win/VC100/game.vcxproj
	win/VC100/game.vcxproj.filters
Add OutdoorPvP class

Conflicts:
	src/game/OutdoorPvP/OutdoorPvP.cpp
	src/game/OutdoorPvP/OutdoorPvP.h
[12098] Add OutdoorPvPMgr class

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPMgr.cpp
	src/game/OutdoorPvP/OutdoorPvPMgr.h
Use OutdoorPvPMgr to save/load capture point data when grid unloads

Conflicts:
	src/game/GameObject.cpp
Add Outdoor PvP handlers to various files

Conflicts:
	src/game/Creature.cpp
	src/game/GameObject.cpp
	src/game/MiscHandler.cpp
	src/game/Player.cpp
	src/game/SpellAuras.cpp
	src/game/Unit.cpp
Implement Silithus Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPSI.cpp
	src/game/OutdoorPvP/OutdoorPvPSI.h
Implement Eastern Plaguelands Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPEP.cpp
	src/game/OutdoorPvP/OutdoorPvPEP.h
Implement Hellfire Peninsula Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPHP.cpp
	src/game/OutdoorPvP/OutdoorPvPHP.h
Implement Zangarmarsh Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPZM.cpp
	src/game/OutdoorPvP/OutdoorPvPZM.h
Implement Terokkar Forest Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPTF.cpp
	src/game/OutdoorPvP/OutdoorPvPTF.h
Implement Nagrand - Halaa Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPNA.cpp
	src/game/OutdoorPvP/OutdoorPvPNA.h
Implement Grizzly Hills - Venture Bay Outdoor PvP script

Conflicts:
	src/game/OutdoorPvP/OutdoorPvPGH.cpp
	src/game/OutdoorPvP/OutdoorPvPGH.h
[12100] Finalize Outdoor PvP Implementation

Implementation by Xfurry and stfx

Thanks to all original Outdoor PvP authors - especially Balrok
Thanks to X-Savior for the proper data
Thanks to crackm for help with database

And thanks to all people who contributed and/or posted bug reports

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>

Conflicts:
	src/game/World.cpp
	src/shared/revision_nr.h
[mr2161] fix OutdoorPvP after last merge
[12101] Implement spell 36677

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
[12102] Implement ACTION_T_CHANCED_TEXT

This action allows to display a text with a chance.
The Chance must be provided in param1, text(s) can be provided in param2, optionally param3

Conflicts:
	src/game/CreatureEventAI.cpp
	src/game/CreatureEventAIMgr.cpp
[mr2505] Make vehicle_accessory table more compatible with DBs renaming it to default MaNGOS names.
Revert "[12067] Use world state enum for adding/ remove a state in bg and various cleanups"

This reverts commit 52329743191ee24d433676a5de9165bc4483ae8b.
[mr2099] add return value to LockedVector::erase(itr)
[mr2100] implement LOS checking in CreatureCreatePos and use for pet/totems. related to #705, #1067
[mr2101] store passenger guid instead of pointer in VehicleSeatEntry. related to #1089, testing. may heve unexpected results!
fixed typo in _proxy; thing connects to rabbitmq and maintains connection. more stuff after a short (?) nap
Change the filled color for each state.
Adding different colors for the geo map.
fix #1866
Merge branch 'master' of ssh://github.com/maqetta/maqetta
remove unused method
Update to Dojo 1.8.2 #3581 #3606
Use variable for config file instead of pad.
Ajustes de checstyle e na tela de atendiment
first screen changes
Add minimal backbone app for vehiculos
Ignore R related files
Encuesta corrupción Perú 2012
Update .gitignore
Initial analisis mozilla.pe
Add make clean
correction requêtes
configure.ac: Disable strict aliasing

Hint from yet <yetingfeng@gmail.com>, thanks

Signed-off-by: mathslinux <riegamaths@gmail.com>
removed the include folder
Removing Egal from filters module
add related_name to price base so you can have multiple price instances
add hook for app content
add hook in payment module
MwSt ist 8.0%
implement different way for redirect. -> Feedback mk.
Checkout process decorators: The shop is always available as a keyword argument
kommentteja ja pikku muutoksia, kuten mapoverlay
PatternSearch almost working
all white status bar
back to solarized
add growl_tcp_notify_with_data().
support Notify() to growl_tcp_notify_with_data().
remove compiler warnings.
Ficheros

Todos los ficheros
Merge pull request #3 from ulisesmt/master

Los ficheros
Buttons and Events fixed

- Buttons are in their new place, according to the background.
- Removed unneeded code.
- Tested on iphone 4 and Sony Xperia Play, working fine.
Finished generator to match packages ZIP file
Merge branch 'master' of github.com:mavlink/mavlink
Fix issue#10, lost syntax highlighting when having focus
Spacing
Begin rework of Taming skill
More tweaks to Taming.
Javadocs, added Lighting to the damage types affected by Shock Proof
Fixed NPE with repairing items that rely on metadata.
Minified (SHA: db4116efba1fb367db33e1ec13b48a2e3a298a52)
PROTON-1: patch from mcpierce to provide %contract for swig APIs

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1376197 13f79535-47bb-0310-9956-ffa450edef68
some comments :smile:
require unnecessary
update test for unused local vars
support more Flex metatags
support more Parsley metatags
Use local Jake and test:cli for Travis
Add extended sign up attributes to users.
slim myquery.remove tools.userAgent,myquery provide AMD moudule judgment;
	modified:   myquery/base/support.js
	modified:   myquery/html5/css3.transition.animate.js
	modified:   myquery/main/query.js
	modified:   myquery/myquery.js
Basic documentation for each module
Fix HexdumpHandler, add rawData to messages
Sphere scale

Checking in slider and functionality for sphere scaling
q4.16
q4.17-21. end of sec4.1.6
Site regeneration
Added some additional categories for How to Kill a Platform in One Easy Step
Added usability to my About Aside
fixup_overlay() should ignore symlinks, they only cause trouble
add make index to org-mode
Release 1.12.2
Post-release version bump
stray development
Merge branch 'refs/heads/db_woes' into development
Correct collection theme selection.

Use Stylesheet instead of Template to ensure that child themes are
handled correctly.
Imported from SF niftools svn
installed nokogiri
generated `Entity` scaffold
worked on Entities (`#index` and `#new`)
added Michael M. and James M.
added seat AC
Deltacloud client - restore ability to use http://USER:PASSWORD@deltacloud
format where possible - as well as the -U -P flags if URI parsing fails.

Addresses JIRA DTACLOUD_282

https://issues.apache.org/jira/browse/DTACLOUD-282
Version 1.0.5-rc1
Fixes JIRA DTACLOUD_296 - storage volumes and HTML UI

https://issues.apache.org/jira/browse/DTACLOUD-296
renamed message and poll socket records
ylimääräinen hakaristi
id-testiä
avahi: testi-mainostamisohjelman oikeaan signaaliin kytkeytyminen
fix to erra.bus.buffer_size handling
Updated content analyzer and added documentation.
Merging to master
Merging to master
Merge remote-tracking branch 'origin/working'
Merging to master
Merge remote-tracking branch 'origin/working' into gh-pages
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/working' into gh-pages
Merge remote-tracking branch 'origin/working' into gh-pages
Merge remote-tracking branch 'origin/working'
merging to master
Merge remote-tracking branch 'origin/working' into gh-pages
Merge remote-tracking branch 'origin/working'
Merging to master
Merge remote-tracking branch 'origin/working' into gh-pages
Merge remote-tracking branch 'origin/working' into gh-pages
Merge remote-tracking branch 'origin/working'
Merging to master
Merge remote-tracking branch 'origin/working' into gh-pages
Merge remote-tracking branch 'origin/working'
merging to master
Debugging the wizard
Separation of matrix classes. Filling matrix classes out. Added some notes with recent bench runs.
watch is a native function in Firefox, changed to watching
doc: dataflow chapter structure
add asset loader
implement sprite batch rendering for isometric tiles
增加paperclip支持
Refactor: PossibleMoveTree.java -> PossibleMoveGraph.java. Also, changed the neighbors to be stored in LinkedList instead of ArrayList
attempt #2 pause
minor --make stuff

- use eval rather than JSON.parse for reading the Makefile (I dislike the
  obligatory quotes in property names in JSON)

- locate files relative to the path of the Makefile
rewrite install script in bash
split bash/zsh config, aliases & function into files
`PATH=~/bin:$PATH`
remove .profile
remove `github-markdown` (moved to Coral)
move to pushd directory
Updated .schematics
Add support for running js tests via server

- Fix up the rest of the tests
- Make js now copies over the jstpl file
- JS tests are served out of make jstestserver so that we can do the ajax
request to get at the jstpl file without cross domain @#$#@%$#
VESA EDID support on debian package
ldf/bg fix
add jruby-openssl
variable names fixed
from profile-calls.cc
Add Makefile target to update ocamldoc on gh-pages
simplifying timer
Fix #150 - Returning Int sets status
Ignore test that hangs SBT after fix for #150
contentType is threadsafe no longer hangs SBT
moves swagger to proper directory, closes #174
Merge pull request #173 from mnylen/feature/return-int

Fix #150 - Returning Int should set status
Moving templateName to the section x-root
Attempted speeding up element disabling
Remove unused templates/konf fragments
Move config up, so that confs could specify what attributes to extract
Remove persistHash code, as it is now delivered by preview server.
Split overwhelming regular expression
Get timing log to reflect the fact that we need to wait for DOM completeness
When final output result is presented, mobject logging removes internal object properties. Ensure that iteration over these properties is stopped.
BambooFrame method returns the join not set self, closes #220
fixes web form edit view
Update_current when transient is unmapped
listing class now defined with defclass.
data-type class now defined with defclass.
Dont need the pid anymore in the database_id
Fixed echoing that +python is needed to be a proper error call
carousel speed only for android
rename main plugin file (embarrassing how many changes are required, this plugin needs a refactor..)
Fixed integer-mode bug. P3 must be set to 1.
Use 32x32 Firefox favicon (Bug 702538)
Remove unnecessary type
Merge pull request #213 from sgarrity/bug-702538-favicon

Use 32x32 Firefox favicon (Bug 702538)
Add sample data instructions.
Fix section on git conventions

The docs should point to the Webdev Bootcamp guide for git conventions
and explicitly mention git commit message conventions.
Undo AVM1 workaround for bug in AVM2.
Splits nextFrame; implements mouse events and globalToLocal
Merge remote-tracking branch 'mozilla/master' into button-3
Manage button states; fixes event listeners and scaling
Adds button events
Added database schema of Socorro 3
bug 650904 - use SOCORRO_DIR, make system specify JAVA_HOME
Merge pull request #863 from rhelmer/bug765001-modulelist-version

bug 650904 - use SOCORRO_DIR, make system specify JAVA_HOME
note about optional hbase
Merge pull request #612 from rhelmer/master

note about optional hbase
tweak border-radius for desktop search suggestions (bug 818938)
fix categories padding (bug 765645)
use nicer png for arrow
use padding for section
make a manifest for the marketplace (bug 740454)
davor fails grade 2 math
Update requirements/compiled.txt

Change reqs to ==
Added reviewers mini-manifest (bug 793227)
consumer breadcrumbs should link to detail page
do not link to timeline on Marketplace devhub dashboard (bug sadface)
Also clear cache on BlocklistDetail post_save
add min-height for Reviews sidebar on app detail page
add link to windows tutorial
Add quiet and stop in a single command (finish and exit)
Make a class for sidekiqctl so we don't have to pass around ARGV stuff to every method
Merge pull request #97 from bensie/quiet_and_stop

Add quiet and stop in a single command (finish and exit)
MDL-36025 qtype calculated: Fix handling of "-0"
Modify AttributeStore to use the base OwsStore class
updated menuController
catched error in report resource
Merge remote-tracking branch 'jfeldste/master' into dev
release 0.4.1 (based on 0.4.0-166-g619e6f1)
fixing unit test affinity in mojit archetypes

the renamed tests require the DOM and therefore need to have set the client archetype until mojito provides them a DOM on the server. today mojito creates apps that crash during mojito test. a lot of people reported this during the open hack day in bangalore, after they started playing with mojito.
Merge branch 'master' of github.com:yahoo/mojito into fix-skeleton-ut
Reverted devDependencies
release 0.4.2 (based on 0.4.1-1-gfd31a8b)
Merge pull request #395 from FabianFrank/fix-skeleton-ut

fix broken UTs in mojit skeletons
Merge branch 'develop' of github.com:yahoo/mojito into travis

Conflicts:
	lib/app/archetypes/mojit/default/tests/binders/index.common-tests.js.hb
	lib/app/archetypes/mojit/full/tests/binders/index.common-tests.js.hb
	source/lib/app/archetypes/mojit/default/tests/binders/index.client-tests.js.hb
	source/lib/app/archetypes/mojit/default/tests/binders/index.common-tests.js.hb
	source/lib/app/archetypes/mojit/full/tests/binders/index.client-tests.js.hb
	source/lib/app/archetypes/mojit/full/tests/binders/index.common-tests.js.hb
Fixed jslint framework directories
Merge pull request #391 from mridgway/travis

Travis CI Configuration

Please reinstall your global Mojito installation. `npm link` from your mojito checkout or once it is released: `npm install -g mojito`
Adding Travis build status
Merge branch 'develop' into func

Conflicts:
	package.json
Add cross-compiler scripts
  - Tested only on GNU/Linux with bash 4.2.20(1)-release
Rename monitor to cons
Change e-mail address
minor fixes to the vimrc
made it iphone compatible
Add emailBody
Updated API URLs and some Class structure changes.
用户发表话题或回复时, 同时更新session中用户的积分值.
Merge pull request #41 from young40/505db126f5328f445e8ef642ebfb08d2c0c7df59

用户发表话题或回复时, 同时更新session中用户的积分值, 让用户积分能在页面上及时更新显示.
show weight instead
added info message if team table is empty
Added basic Bootstrap styling
Improved Popup and began jqueryUI integration
fixed rare error of receiving GEOIP data after VAT determination
add dualtouchend event
2012-04-21-12.37.37: src/lib/std/src/nj/heap-debug.pkg:  Documented the reason(s) for not switching over from ci::find_c_function  to   ci::find_c_function<prime>.
When trying to get front most window exception traceback dumped on the following scenario:

click('Instruments*', 'Automation')
On launching Instruments sub window pops up, which has few options to select, Automation (AXImage) is one of the type

Traceback (most recent call last):
  File "build/bdist.macosx-10.8-intel/egg/atomac/ldtpd/utils.py", line 177, in _dispatch
    return getattr(self, method)(*args)
  File "build/bdist.macosx-10.8-intel/egg/atomac/ldtpd/core.py", line 348, in click
    self.generatemouseevent(size[0] + size[2]/2, size[1] + size[3]/2)
  File "build/bdist.macosx-10.8-intel/egg/atomac/ldtpd/mouse.py", line 89, in generatemouseevent
    window=self._get_front_most_window()
  File "build/bdist.macosx-10.8-intel/egg/atomac/ldtpd/utils.py", line 184, in _get_front_most_window
    front_app=atomac.NativeUIElement.getFrontmostApp()
  File "build/bdist.macosx-10.8-intel/egg/atomac/AXClasses.py", line 104, in getFrontmostApp
    if ref.AXFrontmost:
  File "build/bdist.macosx-10.8-intel/egg/atomac/AXClasses.py", line 682, in __getattr__
    attr = self._getAttribute(name)
ErrorAPIDisabled: Error retrieving attribute (AXError -25211)
Fixed doubleclick API implementation, it had some untested/unimplemented code

doubleclick('Instruments*', 'Automation')

Traceback (most recent call last):
  File "build/bdist.macosx-10.8-intel/egg/atomac/ldtpd/utils.py", line 177, in _dispatch
    return getattr(self, method)(*args)
  File "build/bdist.macosx-10.8-intel/egg/atomac/ldtpd/mouse.py", line 133, in doubleclick
    window.doubleClickMouse((x, y))
NameError: global name 'x' is not defined
If object doesn't support Press, trying clicking with the object coordinates, where size=(x, y, width, height) click on center of the widget

Noticed this issue on clicking AXImage
click('Instruments*', 'Automation')
auth.php 재작업 완료
스킨설정(디폴트 설정시) 기능 완료
delete closed client data
Vim stylus plugins added, zsh tweaks
Merge remote branch 'origin/work' into home
First draft at tab loading -- still eval's the input js.
^ Better loading system (doesn't eval the returned code)
^ Tab panel loading is working after a fashion
^ Getting grid panel to fill the entire tabPanel
^ Tuning prefetch infinite scrolling performance
^ Making tabs have nice icons
^ making Rest store an element
^ Cleaning up
- Cleaning up unused files
^ Removing tab panel title from homepage
^ Changing naming conventions
^ cleaning up naming conventions
^ more work done, staff can show up now (although you can only view one tab at a time)
# allowing multiple tabs to show up properly
^ Making columns flex
^ Action buttons in a column, remove loading indicator for tab
^ Pre-work to make automatic column spec creation work properly
^ Auto generation of grid columns now working :-)
^ Better autogeneration of related fields (only the displayField is shown)
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/home'
# Bugfix for modern server (timezone issue)
^ Moving grids around
^ pre-work for getting project panel working
^ Ext.ux
Merge remote branch 'origin/work' into home
^ Getting search box to show up on the front end (needs work in the backend though)
Fixing client modification
Merge branch 'master' of https://github.com/necronet/XTrade
Implementing tabs on client insertion/modification
Merge pull request #3 from cbolanos/master

Tabs Implementation
tests: pkg-config treats tilde in reverse of how we got it in 0.8.4.
Includes tx in LockNotFoundException messages
Remote shell is off by default
Null defaults should not be set in config hashmap
add more color sets
rearrange gui, fix inverter animation
Updated Italian Translation

Italian translation updated
more "C"
:D:D:D:D:D:D:D:
Turn the overview mode back on.
Do not allow multiple clicks.
Prepare for v4.0.0
use ctrlp instead of command-t plugin
tmp backfix
Updated to be less susceptible to changes in the C libraries by not mapping the structs in java.
 Updated to work with udev 175.
Added exmaples path
CS-Fixer run.
Fixes bug 4512.

* Make the privacy icon for location work by correcting "HASHREF" to "HASH" in
a few places. (the code for this icon was already there, just not working for
this reason)

* Add a privacy icon for each email address.

* Remove the privacy icon from the "Contact Details" title

* Add a privacy icon to the "Other Services" title.
graph height/width
Genuinely fixed README.md

turns out github doesn't support backticks
why github
why do you make me re-commit
updating linux_c
St. Lucas name in banner

name change in banner
forsed error on unused vars in jshint
0.1.10 released
Base de dados incluido
The dictionary begins to work --processing packets--
fix the initial value of constant bufSize = =|||
Update README.md

Scenic released!
(Android) Add in code to set refresh rate to that of the device's
refresh rate in case display screen has a refresh rate lower than
60Hz - ie. 58.2Hz/59.0Hz - is ifdeffed specifically for PHOENIX_LEGACY
- new Phoenix frontend needs to do pass the refresh rate of the screen
determined in the Java frontend to the native activity - see phoenix-legacy
code
Merge pull request #86 from notaz/arm_linux

Arm linux/NEON improvements
Print AS when compiling ASM source.
(Android) - New phoenix frontend - use startActivityForResult for filebrowsing
- Get rid of most PHOENIX_LEGACY ifdefs - code now works for both Phoenix and
Phoenix-legacy
- Refresh rate auto-configuration should work now on Phoenix
- Going to get rid of Phoenix-legacy soon altogether
Only increment to next frame if frame is non-NULL.
Use correct PREV semantics.
(Phoenix) Can now go back to 'Select libretro core' from 'select
ROM' menu by pressing Back button by returning RESULT_CANCELED
from DirectoryActivity
(Android) Remove Phoenix-legacy - meancoot's Phoenix now default
Report EGL errors.

Fix a few warnings along the way.
generate an infinite stream of fibonacci numbers. saturday morning!
SRC 12
start with default image
resize function
combobox added
kinetis: bugfix in kinetis_write() fallback path

Offset calculation into buffer was wrong and code would read outside buffer
if count was not a multiple of four.

Change-Id: Ied625b10221423d5a5f25d27ce1edd8c2c3eca8a
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/749
Reviewed-by: Peter Stuge <peter@stuge.se>
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Update notes for submitted changes

* mips: Forced to running state to enable (subsequent) target halt.
Add net-http-persistent support; bump version to 0.1.7
pts algorithm...sql.txt with foreign keys
Merge remote-tracking branch 'origin/master'
first draft of cba3 for 1142 finished
Center, Bold, Bigger Labels
separate custom and oh my zsh
upgrade zsh files
No more ugly blue bg on tag matches.
password fix in upgrade.sql (missed in upstream)

Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
added a check for profile to hide people who you do not share a team with
toStringArray method in Alarm class for saving
loadAlarms class to read saved alarms
a simple word count example
カレントディレクトリ以下の.DS_Storeを削除するrmdsstoreを追加
this will cause a conflict that requires a merge!
bug fixed 2 cause conflict
Fikset bilde informasjon
Fixing debian build files - (re)moves deployment/bin/openxpki* files

Fixes the debian package stuff
The current files from deployment/bin/ are moved to server/bin and included
into the debian packages.
The old files from the deployment/bin/ directory are deleted.
nambahin menu member