labofsahil/github-event-dataset-2012 huggingface dataset:
remove tags file from git
Add git ignore file
change to use blktrace_api.h
ignore *.swp files
use ptherad_barrier
delete dio_shark.o
fix file creation mode

delete existing file when creating new file and
set read/write permission properly.
dio_parse.c (not applied endian converting)

* test parse application
* it does not applied the endia converting

* dio_nugget is works of a sector

* insert_proper_pos(..)  insert the entity to proper position about time value
update Makefile

* make dio_shark.c and dio_parse.c together
modify result file name

* modify filename dio-shark.out to dioshark, dio-parse.out to dioparse
solve endian problem
add rbtree struct and interfaces

* dio_nugget is a action occured in specific section
* add rb_search_nugget
	__rb_insert_nugget only for internal use
	rb_insert_nugget for insertion
working version
1、完成菜单编辑页面。
2、修改弹出窗口为不可移动。
Added new Button Interface
Added new time to the ToDo list
Implement FilePath.Equals() and GetHashCode()
Make TreeChanges and TreeEntryChanges expose native paths

Fix #171
Validate ReferenceWrapper ctor reference argument
Implemented IRepository interface
Make Branch mockable
Make Commit mockable
Make BranchCollection mockable
Make Configuration mockable
Adding RepositoryExtensions unit tests

These unit tests isolate testing the extension methods and don't require
creating actual repositories on disk. They are meant to demonstrate how
using interfaces can help isolate code being tested.
Make Blob mockable
Make Diff mockable
Make Changes, ContentChanges and TreeEntryChanges mockable
Make Remote mockable
Make RemoteCollection mockable
Make RepositoryInformation mockable
Update lib/gmp-ocaml
Don't let empty string to override system settings
Merge branch 'fixes' into non-timestamped-backup

Conflicts:
	core/components/databackup/elements/snippets/snippet.backup.php
restart all vimrc
add zabbix-1.8.14 files
Further adjustments to edit.coffee with regard to auto save behavior.
started view controller
sliughtly more error resistant code
Checking the underlining features of readmes
backbone-kata5
move filesystem api to sys library

Signed-off-by: yayanyang <yayan.yang@gh-ca.com>
Modify feature test to check teacher only activity

- Modify feature test to check teacher only activity in Recent Activity,
  Full Status and Instructional Materials page.

- Modify feature tests for the change of Run Investigation to
  "Run as Teacher" and "Run as Student" in
  Instructional Materials page.
Merge 'origin/AutomatedTests' into AutomatedTests

- Merge branch 'origin/AutomatedTests' into AutomatedTests
We're now using the right scale factor when flipping a visisted house.
Tweaked the height of the label on the color houses level.
Added a new directory for the image sources.
Add adapter for ListFragment
2012/06/11/IRC
2012/06/11/Twitter
complete rewrite of ESpacenet
Merge pull request #338 from adam3smith/espacenet

complete rewrite of ESpacenet
Custom field mappings should be strict (don't allow arbitrary prefixes). Fixes issue #390
EM now stores "description" in abstractNote, Don't need to include it in custom fields.
Merge branch 'master' of git://github.com/zotero/translators
Merge branch 'gh-pages' of https://github.com/zourbuth/phpbb3-id.git
Merge branch 'master' of https://github.com/zourbuth/phpbb3-id.git
ff12345r5rq5595g67v156789526c67f554v4
modified config path and removed useless file
Update in response to Go weekly.2011-10-18
Update in response to Go weekly.2011-11-02
Update in response to Go weekly.2011-11-09
Update in response to Go weekly.2011-11-18
Update in response to Go weekly.2011-12-01
Update README.md
Update in response to Go weekly.2011-12-06
Run "gofmt -s" on all Go files
Merge branch 'master' of https://github.com/0xe2-0x9a-0x9b/goam

Conflicts:
	install.go
	object_go.go
	object_makefile.go
Add support for gotest examples
Fix a typo in support for gotest examples
Finish support for gotest examples
Update in response to Go weekly.2012-01-15
Update in response to Go weekly.2012-01-20
Implement sets as map[X]bool instead of map[X]byte
Update in response to Go weekly.2012-01-27
Sort files by name before passing them to Go compiler
Update in response to Go weekly.2012-02-07
Fix a small bug
Use "go tool ..."
Dummyinstancen benammt
A bunch of WCF code and bug fixes after testing the Windows Service.
Setup foreground observer correctly so it will be removed when the view is hidden.

The UIApplicationWillEnterForegroundNotification observer was not being
removed when the tweet sheet was hidden so if access to the Twitter
accounts was denied in iOS 5+ then whenever the app entered the
foreground it would constantly ask for permission to access the
accounts.
Restored sounds in gtk mode
Fixed shortcuts
Improved tray icon menu in Gtk
Updated version number
More patches to the duplicate statuses deleted
Reduce size of code
[SHRINKRES-57] Package rename
can we enable these here?
reverted use of the from address to the default
Implementada primeira instrucao (LDY imm).
Adicionadas 2 instrucoes do 6502, e mais duas outras para testar...
Dropped mssile count and dropped a hardpoint from the Meteir. It's too fast to pack so much heat.
use sys.argv[0] for program name
#44 Wrong persist used for registering user
Slight ramp up of .iva frequency on OPP 6 and 7.
Disable GENTLE_FAIR_SLEEPERS for better performance.
Added MongoDB partial support (Driver, methods, wrappers) and updated WebService.
Completed the implementation of the gen_server interface
back to squid
Merge branch 'master' of https://github.com/AlexBaklanov/InBody
Fixed speech to action interface.
seems impossible , but , guarddog document is now complete :D (!)
[upd] Various submodules updates
Produkt, procesy
removing {{puffery}} tags as it redirects to {{peacock}}
and when merged could it be informed at http://en.wikipedia.org/wiki/Wikipedia_talk:Twinkle#Puffery_template
Revert cause it doesn't work.
Removal of wall fixed.
Fix for essences.lua (code section updates the essence menu if it adds
alcohol so quickly that the server doesn't update the essence status, it
has to refresh the essence menu until it sees the picture to start the
essence
mod: TODO.md
Bit of hardening to prevent javascript errors when called outside of the ariadne environment.



git-svn-id: https://svn.muze.nl/svn/ariadne-php5/trunk@5360 7882d7ee-46e0-0310-a255-a28a61b628e4
mapa en search
updated dependencies
use @@config class variable to set a custom repo, very useful for testing
added a refresh option to deploy
Updated gem and rakefile
Updated RestKit
Updated build settings
Updated info.plist
Update reference to info.plist file
Initialisation de la config initial
Suppression settings backup
Changed individual pages to one DoctorListPage
request versions of gems that work on ubuntu/debian
fix possible split call on nil
Merge pull request #224 from martinpovolny/debian

request versions of gems that work on ubuntu/debian
Merge pull request #226 from martinpovolny/nil_metaobj_lookup

fix possible split call on nil
hair styles front, back side
добавлено редактирование лекарств, хотя еще не очень работает ^_^
Fixed qouting on lists
Little amelioration
whoops, forgot to add file to repo
Update StockCraft/stocksell.java
adding votes model
merge HEAD
Fixed issues created due to directory changes.

Also split each class into its own file, for more object orientedness.
Commit counter 23. Several fixes and improvements. Main changes as follows:

#index will only work from item 'views', but #getIndex() now available from
nested {{if}} blocks etc. (fixes #173).

Fixes and improvements for associating resources (tags, helpers, converters)
with template. (See #170)

Sample test page for above nested resouces feature: nested-template-resources.html.

New feature for deep paths, which now allow a.b.c when a or b are null to
render an empty string, and not throw. Just set noerror=true. Updated sample
step-by-step/07_paths.html to show this, as well as the new comment tag:
{{!-- this is a comment --}}, and the use of aliases ~foo=expression for
providing access from nested templates without using #parent.parent.parent...


Continued improving compiled template output for ease of debugging. Set
$.views.settings.tryCatch=false; to cause errors thrown in compiled template
rendering to throw in the template, and facilitate debugging from there,
rather then rendering the error string and continuing... Example of this added
in nested-template-resources.html test page.
Filter out all characters but '+'sign and digits from imported numbers

Some firmware versions of SPA phone do not dial numbers containing signs such as  '-' or brackets
Merge pull request #2 from Bounder/master

Filter out all characters that are not digits or '+'sign from imported numbers
autosave in progress, with much debugging statements
send active mail

send active mail
Creating highscore generator.
a
貯金系のラベル直した
Merge remote-tracking branch 'origin/master'
Corrected alpha for shapes for Mugic Plugin
Merge branch 'master' of github.com:CalVR/calvr_plugins
getting started video for reals
Removed broken Xcodeproj bundle install command from rake bootstrap task
Merge pull request #218 from willpragnell/master

Removed broken Xcodeproj bundle install command from rake bootstrap task
Fix build files associations. The UUIDs attribute is called `files`, not `fileReferences`.
Fixed caption size.
more changes to modernizer
View only fetches drafts for currently logged in user, no this isn't needed

- Previously the post_list view would return published and drafts for the user
  when you hit their /<username>/ page so we needed this code to prevent other
  logged in users from each others drafts.  Now this logic has been effectively
  moved to the view code itself.
adding therubyracer in the gem file
Added a Pages controller
I'm done with static pages
Minor fix for reference sections mistake as numerically delimited.
updated project and added network setup
Here comes the user management! :)

Big thanks to Raghav Shood
Flag duration fix
Add the OTA updater

Change-Id: I544203a26f13f0723d0e96add249160cb606cf9a
Changed source for Islandora module
added windows patterns to .gitignore and rename project
added a skeleton for Problem 259
added 259 and refactored towards bigints
added full solution for 259
added distinct for performance
Merge branch 'master' of https://github.com/DanielFabian/fsharp

Conflicts:
	ProjectEulerSolutions/ProjectEulerSolutions/Iit.Fsharp.ProjectEulerSolutions.fsproj
Added a solution for Problem 1
added filter for interesting problems in the main program file
Added bin folder to .gitignore
ny 1.6
Patch for #1085
Patch for #255/#974
Merge branch 'experimental' of https://github.com/Daxter/active_admin into experimental
added muppets

Change-Id: Ica5891aa6319e143688102928b1538f46fd09fab
change to my branch, remove updater

Change-Id: I179ac281d7f77dddf4a165adf8431815864faacb
added devil kernel

Change-Id: I531304be13fee3f02f6df932d399110b6beb5198
Implement API for mob despawn when away from players. Adds BUKKIT-2986

As of 1.4 mobs have a flag to determine if they despawn when away from a
player or not. Unfortunately animals still use their own system to prevent
despawning instead of making use of this flag. This change modifies them
to use the new system (defaults to true) and to add API for plugins to adjust
this.
Fire EntityFormBlockEvent for FallingBlocks. Adds BUKKIT-3078
Ensure animals don't despawn due to old default setting.

The old default for the persistent flag on mobs was false which was then
written out to their NBT data when they were saved. We now use this data
for all mobs, not just non-animal mobs. However, this means animals that
spawned before that change will now start despawning like monsters do.

To avoid this we add a new flag to the mob's saved data to mark if the
data was saved before or after we started using it and ignore it if it
was before.
Allow placing blocks in spawn if ops.txt is empty. Fixes BUKKIT-3004
Add a custom shutdown message set in bukkit.yml. Addresses BUKKIT-3031
Persistence isn't just animals. Fix BUKKIT-3105

Also set to this value if the persistence hasn't been updated
Don't run command blocks in empty worlds. Fixes BUKKIT-3094
Refactor all OBC, libs, and NMS into versioned packages.

org.bukkit.craftbukkit and net.minecraft.server will now include the
minecraft version in the package name. As the internal implementations
are known to change dramatically, this refactor reduces the strain on
support requests due to version mismatching.

org.bukkit.craftbukkit.libs will also have version numbers for each
imported set of packages. These are not dictated by the minecraft
version number. This is done to prevent future incompatibilities.
Not enough testing went into this, you can't have packages start with numbers.
Implement API for wolves collar color. Adds BUKKIT-3109
Merge remote-tracking branch 'upstream/master'
cgjgndg
Commit mrHook
spinner/chooser saves tag-friendly values
весь текст переехал в вики раздел
Trying to integrate bootstrap tabs (WIP)
Echo.View - "clear" method is now private again
added search engine for users to find friends
updated layout explanation png
upgrade to a more recent jquery. bootstrap requires $().on() for events.
Fix Play movie in Lich King
Corrected default feed data retrieval.
Fixed a comment.
Added function to retrieve a feed by its feed name (term name).
Added a feed generator that takes an array of strings arranged in sequence.
+ updates for personalGenome survey
* example for personalGenome (copy of helix page)
* fixes for default.css
+x server/qpanel
+ more customizable styles options for questions setup
+ condition for section (with little hack to be fixed)
* variabler titleHeight
removed ignored file from index
updated GitPage
:portal hook is now much more powerful
README file has been updated.
Merge branch '0.0.2'
Validacion para que los atributos de las entidades no empiecen por mayuscula, ya que en ese caso no se guarda en base de datos.
Fixed Bug aplicacion Test, envioMails
- Documentación de la app de ejemplo nuevaPaginaInicio
 - Eliminando ficheros bytecode apps/nuevaPaginaInicio/tmp/bytecode
+ Fixed bug grupo.html
minor corrections in schedule
only new stuff in this branch
Set the default slave_exec to the installation location
remember: align to size-4 even for stdcall
more stdcall fixup
improve iterator behavior when slicing a const int range or range including one
kwioehrwoegjfpao
Ajout route fr
Create BIN-STL-LoaderSource.js
vers un intervalle entre rafraîchissement en préférences
une target install avec chemin en dur…
Initiated work on guide page
Creating separate has_ad and get_ad functions that use query_ad method, passing kwargs on to ad template
fixed setting the active panel, following Jusuff's recommendation
Revert "static"

This reverts commit 61644ec376adb28d38414a77886c73fdd825208d.
just in case
more stuff
modify the os.h files
Settings for Solarized colorscheme; make it work in the terminal :)
0.16.0

USER:
- добавлена возможность редактировать грппы пользователей (back).
Completed Settings
+ add bash-completion.
* Fixed a bug of adding noatime option for ext3.
* Fixed a bug of disable env reset in sudoer.
- remove sohu dag yum repository.
+ disable tty required while sudo from remote.
年份写错了,大哥
Merge pull request #1 from wendal/patch-1

年份写错了,大哥
Merge branch 'develop'
Merge branch 'master' into develop
Merge branch 'develop'
New: additional information on details tab for account | contact.

Fix: Save button for quickbutton popups
Fix:  display full country name in listview instead of landcode
Merge branch 'master' into develop
add cameraconfigurations to persistencefacade
Merge branch 'master' of github.com:Hofmaier/wintermute
add RGB Bayer to tis extension
remove classdiagram from repo
working on insert shotdescription
make ping routes respond to the required project
Hipsterize further
Remove references to PixelUser
EC2 scripts: minor updates
Modif Quote() PDO
Add test user account and made sure account details are entered into the handlesystem collection.
cambio estético
paso el modelo a ActiveRecord::Base
detalles de las rutas
atributos y asociaciones de calicata a csv
Merge branch 'csv'
Added a shorter terminal 'subl' alias
Adding a functions file with a server function from @mathiasbynens - https://github.com/mathiasbynens/dotfiles/blob/master/.functions
Add md, cdf and gz functions from @mathiasbynens
Adding #!/bin/bash file headers to all bash/ files
Added finder and chrome shortcuts to .aliases
added avatar and public profile link to QandA.
Merge pull request #2 from InvestoPresto/forum-views-changed-for-styling

added avatar and public profile link to QandA.
ISLANDORA-766: Allow arrays relationship objects
Merge pull request #186 from adam-vessey/6.x-extend-add-relationships

ISLANDORA-766: Allow arrays relationship objects
Added timezone to quickdialog
changing car position
fix the bug
add the user_id to comment
fixed the bug
fix
More rest improments
added some comments and fixed acc update function
Aun no se redactar
more examplitosssa
.task() & .fork() to handle seq/parallel sub tasks
tests :)
Changed 2 renders to GL_DYNAMIC_DRAW, dunno if it improves performance or not
tweaked home page raspberry pi text and image
fixed up home page link to cyber-dojo blog page - would you believe the blog page URL changes every time you do an edit. Sheesh
Chat funkt jetzt erstmal
Institution view, result list: added text for missing search terms
- backend, oprava
fufu logo redo
Ajout des fichiers de base - Test Cube CSS3D
Removed unnecessary dependencies

 - cleaned up pom.xml, removed commented and unused imports
 - removed spring dependency from beans.xml
 - created testing profile in maven to separed the testing configuration
Migration to JBoss Java EE

 - removed dependency on Oracle Java EE
 - added JBoss version of JEE dependencies
 - disabled PrintService due to missing dependency, deprecated
TestNG Suite configuration

 - defined groups services and initialization
 - set up suite to initialize arquillian at first
   and then run initialization test. Finally execute
   service tests
 - changed name and package of initialization tests
Designed ArquillianDataProvider and database-cleaning-test

 - added ArquillianDataProvider handling the Arquillian bug with @DataProvider
 - added test to clear whole database
 - renamed test-suite target to 'Arquillian Test'
Automatic commit of package [converge-ui-devel] release [0.8.2-1].
Change authorize.php for scope required and login required.
AuthCodeにuser_idを含めた
Rename exerciseName to exerciseId since that's what it is
Separately track exerciseId, exerciseName, and exerciseFile so issue reporting works properly
Handle case in combining_like_terms_2 where constant terms simplify to 0

Summary:
fix #26874; fix #29882; fix #29943; fix #29949; fix #29964; fix #29969;
fix #30088; fix #30091; fix #30108; fix #30118; fix #30138; fix #30177;
fix #30205; fix #30257; fix #30258; fix #30276; fix #30279; fix #30280

Previously, the last hint would show something like "-24a + 0" and the regex
answer would expect you to type "-24a0". This fixes the final hint to show just
"-24a" and the answer regex expects "-24a"

Test Plan:
Tested these problematic seeds outside devappserver (before and after the fix):
http://localhost:8000/exercises/combining_like_terms_2.html?debug&seed=112&problem=c_fd_fbx
http://localhost:8000/exercises/combining_like_terms_2.html?debug&seed=177&problem=c_fd_fbx
http://localhost:8000/exercises/combining_like_terms_2.html?debug&seed=161&problem=c_fd_fbx

Reviewers: stephanie

Reviewed By: stephanie

Differential Revision: http://phabricator.khanacademy.org/D742
first SummonerGameSummary preview
(need more work, position and that f****ng huge whitespace at right)
fix some consequences of Bootstrap
Update DataManagementSystem/private/TransferTask.py
regen docs
Merge branch 'master' into gh-pages
regen docs
Merge branch 'master' into gh-pages
fix links
Merge branch 'master' into gh-pages
regen with ga enabled
disabled logo animation
fix ga and use layouts
docs
Merge branch 'master' into gh-pages
fix link
docs
Merge branch 'master' into gh-pages
fix heading
updated docs
fixed; repair mongoose.SchemaTypes alias
fixed; docs: link to MDN Function
Merge branch 'master' into gh-pages
docs; note field selection in model methods
sampler sencillo
Core (VisParam): Eliminate the use of type-punning for float param values
Core (Build): Turn on strict aliasing for all build types
Core (Tests): New math utility library for testing
gingangooly
Added new functionalities

Calculates routes, show its directions, show hospitals and firestations
at Lisbon
...
Removes project symbols before project name is erased(thus not attempting to remove a null key).  Added an apparently unneeded terminal function (didn't do what I thought it would).
Failed exporting env variables to terminal... too much feed back and just doesn't work when an app is running.
Added a 'goto definition' to document context menu
Add project folder to open folder dialog shortcuts, added some comments for goto def stuff, and cleaned up some stuff and messed up some more stuff :)
Model nextModel_#NodeID_002092 has changed stage to PRODUCTIVE. Storing a backup of this model in ELABORATING stage.
Model Person_#NodeID_002441 has changed stage to ELABORATING. Storing a backup of this model in ELABORATING stage.
Model Person_#NodeID_002441 has changed stage to ELABORATING. Storing a backup of this model in ELABORATING stage.
Model nextModel_#NodeID_002092 has changed stage to ELABORATING. Storing a backup of this model in VAGUE stage.
Making Preference Pane and related targets build.
initial msc pressflow 6 fork, probably broken or at least undocumented
new module for basic tree functionality
Zenburn color scheme for Putty
added normal / social event attr for facebook
Merge pull request #183 from voidus/500

send 500 on server errors
还是不能晚上写，问题太多

Signed-off-by: Meathill <meathill@gmail.com>
changed keycodes
did graphs
Service Call - show
Provider show
Sign in
Sign out
Organization
Profile
Service Call - show
Provider show
Sign in
Sign out
Organization
Profile
Make max_durability more robust
MODE-1338 Convert Teiid sequencer to the new 3.0 sequencing API
Modified the JDBC model object handler to explicitly handle types and properties. Also tried to clean up some issues surrounding
multi-valued properties. Removed all but 2 TODOs which are reminders when work on sequencing Teiid's model extension definition
occurs.
MODE-1338 Convert Teiid sequencer to the new 3.0 sequencing API
For a test that was failing locally, I increased the time the test waited for the sequencer to finish. This fixed the problem.
Change 'ModelSEED::Configuration' to allow validating user options.
  - Now transforms relative paths to absolute for relevant options
event IDs, basic command-line interface
tabs to spaces
Added /assets to static routes
Got rid of horizontal scrollbar on the terminal module.
CHANGELOG: Update

Signed-off-by: Charles Joly Beauparlant <charles.joly-beauparlant@crchul.ulaval.ca>
fixed score alignment

fixed yo
Add in tests to open each file in test_batch_download. Also explicitly set overwrite=True when using file_upload
Removed those stupid classes
Pas de .exe non plus
addedd homework
Adding more aggregate output on Analysis sheet
Improving running of the game / reporting stats
Adding card counts to average stats output
Messing around with data output

I'm not sure I like this direction - it's too difficult to make the
output look good. Perhaps we should try Excel?
Fixed page rendering and added additional styling for Sentire theme.
rearrange synchronization for rendering to improve frame times
Don't count the entity allocation as part of the spawning
To resolve error - undefined method when click new asset link
interruption codeur

j'ai testé que l'interruption n°3
UI progress on addEdit Recipe page
#25 fix refresh token in client credentials flow
SEXY RUSSIAN LICENSES FOR YOUR #69 FIX PLEEASURES
updated onload function
Document map customization

Signed-off-by: Jimmy Theis <jimmy@jetheis.com>
Augment model for new link types

Signed-off-by: Jimmy Theis <jimmy@jetheis.com>
Add parsing of new link types

Signed-off-by: Jimmy Theis <jimmy@jetheis.com>
By default just open anything that's not a web link

Signed-off-by: Jimmy Theis <jimmy@jetheis.com>
Make AppleDoc paths more resilient

Signed-off-by: Jimmy Theis <jimmy@jetheis.com>
neljannen raportin ulkoasu
Added fields and methods, also, one part needs looking at.
Rebuild from ssh push
Quoted strings confuses ScalaTest (space seoarated argument strings suck)
Switching approaches for EmptyLocalActorRef and DeadLetterActorRef
Quoting strings differently for multi-node
Fixed ByteIterator.{take,drop,slice} for extreme argument values
Fixed implementations of ByteIterator.getBytes, getShorts, etc.

Implementations were broken.
Fixed ByteIterator InputStream wrapping

Result of ByteIterator.asInputStream did not work correctly in all cases
Added lots of missing tests to ByteStringSpec
Improved MultiByteArrayIterator.toByteString

MultiByteArrayIterator.toByteString now returns the optimal ByteString
representation for the data.
Improved documentation of ByteString methods compact and isCompact
Removed object ByteStringBuilder

* ByteStringBuilder.apply was unusual for Scala Builders
* Moved OutputStreamWrapper implementation into ByteStringBuilder
Changed MultiByteArrayIterator to operate on a LinearSeq

ByteString.ByteStrings new creates it's iterator on a Stream instead of
a List, making ByteStings.iterator an O(1) operation.
Workaround in ByteStringSpec for Scala-2.9 iterator.span bug
Improved ByteStringSpec tests for iterator.{span, takeWhile, dropWhile}
Changed ByteIterator.span to return operand iterator first in tuple

Makes things more consistent, since ByteIterator.duplicate also returns
the operand iterator first.
Added specialized implementation of foreach to MultiByteArrayIterator
Fixed typos in ByteString comments
Code formatting changes as requested by Victor
Made bytestrings private in ByteString.ByteStrings
Simplified implementation of ByteIterator.indexOf
Added changes to Netty pipelines to support SSL/TLS. Fixes #1978

1) Netty server and client pipelines updated to conditionally load keystore/truststore if SSL is enabled in the config
2) Supports any available encryption protocol via 'ssl-protocol'
3) Supported encryption algorithms are specified via 'ssl-encryption-protocol' config key

Conflicts:

	akka-remote/src/main/scala/akka/remote/netty/Client.scala
	akka-remote/src/main/scala/akka/remote/netty/Server.scala
	akka-remote/src/main/scala/akka/remote/netty/Settings.scala
fixed warnings for cube draw
make charged objects have an array of point charges for better physics
Added simple editor menu thing with load/save/new working.
Add blocks with ctrl-click in editor (can't change their properties yet), added focus tracking system to editor.
make makeCharges produce lower rez grids for better performance
Added editable field for start position for player in editor.
Block scale/pos added to property menu thingy.
Merge branch 'editor'
add refined version of proto01_knothole level
LevelExitActioner now works!  proto02 can haz example.  Still need nice sprite.
Added lots of block stuff to editor, made tracked blocks tracks sppecified relative to block position.
Tweaks to LevelExitActioner
Merge branch 'editor'
fix reaction force application locations
make levels sorted by name so QIDs are consistant, make preloader take a whitelist of domains, not just one
Merge branch 'mergeEditor' of github.com:RileyA/STATICly-MAD into mergeEditor
work on some levels
make player movement properly force based, and include reaction forces
merge in charPhys changes
add erik to the list of authors - missed him on first pass
version bump 1.0.0.rc3
Merge pull request #153 from RiotGames/151-additional-cli-options

Allow customization of generated Vagrantfile
Use #any? instead of #empty?
Minor syntax cleanup
Move location search to its own method
Use array matcher where possible
Do not sort result
Bump build-essential version expectation
Merge pull request #155 from RiotGames/failing-specs

Failing specs
Use :rubygems symbol in generated Gemfile
Merge pull request #157 from RiotGames/use-rubygems-symbol-in-gemfile

Use :rubygems symbol in generated Gemfile
Update docs for methods
Indent private methods
Merge pull request #156 from RiotGames/refactoring

Refactoring Downloader
Before download errors, output source and location

[fix #145]
Simplify rescue/raise
Merge pull request #159 from RiotGames/145-download-errors

Before download errors, output source and location
use symbol for rubygems path
Ignore all *.pem files
Add support for a Berkshelf config file
bump solve version for full SemVer 2.0.0.rc1 support
Made a new model of MD 2nd floor, and got mapping with the help of a Bayes Filter to work with this model.
Reduced volume of Sound. Does not work on linux
Done Ana3.
Merge branch 'master' of github.com:Ryugoron/university
Update scripts/tracker.rb
5.3.3  Bloodmoon update (0.20.2)
Removed submodule
Added library as files instead of submodule
Triangle behaviour fix
Version logged still as 3.0.0-SNAPSHOT
OGM-153 Failing JPATests are not cleaning up the TransactionManager thread association
OGM-153 HibernateCoreAPIWrappingTest should not extend JpaTestCase
OGM-154 Speedup Infinispan tests defaulting to local mode in tests
OGM-154 EHCache default configuration: disable check for updates
OGM-154 Speedup EHCache integration tests by forking the JVM no more than once
OGM-163 Implement a @SkipByGridDialect test helper annotation
made searching work!
updated test_level with test platforms
Removes scrollbar from gui vim programs.
Add tmux OSX copy & paste integration.

Was previously in local only config.
Moving all mac so brining local only configs
internal when the local only is OS specific.
AlexeiBarantsev: Adding gecko-12 placeholder

git-svn-id: https://selenium.googlecode.com/svn/trunk@16882 07704840-8298-11de-bf8c-fd130f914ac9
AlexeiBarantsev: Removing a temporary directory created by FirefoxProfile#fromJson on driver.quit(). It seems to be the last known temporary directory created by FirefoxDriver that was not removed on quit. Fixes issue 1934

git-svn-id: https://selenium.googlecode.com/svn/trunk@16883 07704840-8298-11de-bf8c-fd130f914ac9
Attempted server jetty-upgrade

git-svn-id: https://selenium.googlecode.com/svn/trunk@16255 07704840-8298-11de-bf8c-fd130f914ac9
KristianRosenvold: Added javascript back to the idea project.

We have some of that too

git-svn-id: https://selenium.googlecode.com/svn/trunk@16256 07704840-8298-11de-bf8c-fd130f914ac9
Revert disaster commit (accidental) "Attempted server jetty-upgrade"

This reverts commit ab2801d750ab6373c538ea135d48958fec15b9f9.

git-svn-id: https://selenium.googlecode.com/svn/trunk@16257 07704840-8298-11de-bf8c-fd130f914ac9
DanielWagnerHall: Updating location of the gecko-2 sdk.  Again.  Fixes issue 3465

git-svn-id: https://selenium.googlecode.com/svn/trunk@16538 07704840-8298-11de-bf8c-fd130f914ac9
Date parse fix.
algon
containers
array apply
update
Adding dna, more fire color updates -sG
Bringing project into GIT
Eliminated a lot of JSLint complaints
Fixed clipboard rendering
Final commit
Merge github.com:SeveredBrain/D-Note
Subs fix in null player
Added DBC library
Created default project
Added DBC structures and loader, more to come later
Scripts/Ulduar: Fixed some various bugs with XT-002 Deconstructor.

He will now properly reset if he evades while being submerged.
He will not always die directly after heart phase.
Adds will now despawn on reset.
Heart will now change seat and set unit flags properly, but is still not attackable by melee (seems like a vehicle flag bug)
DB/SAI: Fix Quest Cache of Mau'ari
DB/Gossip Core/Scripts: Fix Gossip for Witch Doctor Mau'ari
DB/Gossip Core/Scripts: Replace core script with db gossip for Lorax
Core/Scripts: Script for Frostblade Shrine to start The Cleansing quest.
Quest is not yet scripted.
Core/Scripts: Addition to previous commit.
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore
DB/YTDB: Add needed for YTDB628 updates.
fixed a problem with error handling that could prevent an object from syncing
disable MathJax registration in jsregistry and load it inline in the
MathJaxViewlet
add grade to packages
Rest being handled properly
moving to vm to dev
Rest stuff
Merge branch 'moving' into bootstrap-and-rest

Conflicts:
	application/configs/controllers.yml
Blah
Custom phase-length
Better welcome text modforum.
Easier options for the NMR-policy
Small changes to the Gamecreate.php
Removed the RL-options from gamecreate
Some more changes to gamecreate
m,
errorfix gamecreate
Final attempt to solve the NMR/CD option in gamecreate...
Made ClickToContinue more flexible, can now create an arbitrarily amount of "lines". Prepared scores.py for maybe more modes in the future. Pause surface no longer transparent.
Changed user agent

Signed-off-by: Sovak <Sovak007@gmail.com>
omit hive to trigger build
I think I'm getting worse at version control...
[UniqueValidator] Allow setting custom message, adapt to sf2.1 API
Merge pull request #188 from marekkalnik/feature/unique_validator

[Form] Allow setting custom message, adapt to sf2.1 API
Fix CS
Fix test
Fix bad namespace for constraint classes
Update UniqueObject Validator docs

Add php usage and correct some English
Merge pull request #189 from EdwinLove/update_unique_object_docs

Update UniqueObject Validator docs
Revert "Fix bad namespace for constraint classes"

This reverts commit cca4fd71cec2bb9f74adb979e94436ba47bc60c2.
Merge branch '1.1' into sql-by-bundle
New attack icons
fixed cloud code that stores last locations
added test functionality to configuration data in order to add test locations
added some device test code
Finished persistent subscribers
Started message sequencing
Added ability to have proxy message servers
Avoid deadlocks during shutdown by SIGKILLing Pg

In some cases we have observed a race condition where PostgreSQL
still has connections open, and waits for them to finish before exiting..
However because Test::postgresql is waiting for Pg to die, the test
never gets to close the connection..

This commit only waits for a few seconds for Pg to die, before SIGKILLing
it, then just waiting a little longer, before giving up and exiting anyway.
Add test for deadlocks
rename postgresql to PostgreSQL almost everywhere
Update POD a little, remove old meta.yml
Fix up META data
Initialization method changed
cleaning
@var 0.4.1

remove global funds; fix tests; file moves
visitor patterne hided in unitActionsStrategy
v1.441 added regex
Back to using CPAN::Shell after many hours of frustration.
Some dumb typos and stuff
Added extra/print_time.ex walltime printer wrapper.
Adding basic random, fixing overloads
Added seedRandom
eventueel handig om te bekijken mochten we vast zitten oid
eventueel handig om te bekijken mochten we vast zitten oid
Merge branch 'master' of github.com:TomPeerdeman/OS2012
Got rid of data-position=fixed in div data-role to try and fix problem where it covers up submit button
package: use the new `ffi` package name
added to-dos, made modal subroutines instances rather than static, added downscaling for certain key CSV editing boxes (for small resolution windows)
Split functions into files.
Added some more work plans to readme
code details
hilighting words
Made a basic User mode (including secure passwords)
Fixed currentTotalBet
Fixed UI thread issues
added admin reflections controller
got some teacher views
more teacher views
teacher views…
Merging with StoryJS
some fix
Merge branch 'master' of github.com:VitekLeo/MP3-Screen
Cleaner reloading
I guess I will commit
Working on building JPA thingy for queries :D
[ADD] Add find desk word from other dic
Add more more files from openbibleviewer
game/console: Rearrange status windows, add message windows

Instead of having 3 different windows which show only few pieces of
information, there is now a single window which shows more information
to the user. Also, it's now possible to display a message on the screen
as well as to prompt the user to make a decision (by showing a simple
menu and asking polar questions). Additionally, some deprecated code has
been removed.
Update Convert - JavaLib

Přidány konverze: ArrayList -> String, ArrayList -> Array, Array -> Array List.
Make WP_Filesystem_Base::getnumchmodfromh() return the expected values when the executable bit is set in the input. Props Keruspe. Fixes #20365


git-svn-id: http://core.svn.wordpress.org/trunk@22083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Pass a term object to the delete_term actions. Props bigdawggi. fixes #20645

git-svn-id: http://core.svn.wordpress.org/trunk@21939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Customizer: Redirect back to referrer. If referrer is a front end page, load that page in the customizer preview. Props nacin, koopersmith. fixes #20877

git-svn-id: http://core.svn.wordpress.org/trunk@21028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Merge pull request #51 from Xerkus/feature/test-setup

Add initial tests setup
Merge pull request #51 from Xerkus/feature/test-setup
update mappers with table fieldnames, and a method to clean up data array, also just noticed an issue with zf2 regarding viewhlpers, see issue #3094, views are showing wrong forms
merge tests pr from xerkus with local dev copy (master)

Merge branch 'master' of https://github.com/speckcommerce/SpeckCatalog
Move src/Catalog to src/SpeckCatalog
change namespaces and prefixes for speckcatalog in configs
Options for callback classes.

Callback classes used for Rlint::Iterator can now take a Hash containing custom
options similar to Rack middelware.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
Parsing of bare Hashes.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
move ZenCartListener into EventListener namespace
found issue with milliseconds/seconds

Salvatore is gonna fix it up, continuing to css this stuff
Added recentf-mode by default
tests passing.  need to refactor tests
changed tests
added tests for box 2
adding additional tests
excellence in 2k12!
set of examples were added to examples folder
Added a few rc files that I like.
Merge branch 'master' of github.com:abelmartin/dotfiles
More resx to be added
Add TODO re: rescueing on bad refs
Add caloris_render_partial helper
include listing distance
Merge branch 'master' of github.com:acheng1/demo-mm-411
att updates.
clean up css.
Add -q (quiet) option to configure install. Reduces time of build significantly. Removed editable install that was done in master branch.
Adds in a few Glyphish icons to pretty things up a bit
openal fix
Fix incredibly stupid bug caused by missing 'break' in switch (!)
[BUGFIX] Simplecov doesn't work on rbx but is non-critical
[BUGFIX] Better dev dependency locking
more work on netobj view. more work needs to be done still.
Added deleting projects functionality
Turned giraffe upside down.
Merge branch 'homepage' of https://github.com/adunkman/goingon.at into homepage
longblob to varchar
Fixed terminology + accessibility to Org and chapter creation pages

Signed-off-by: Risa Naka <rn96@cs.cornell.edu>
In Process: Ajax update status of TODO item
Use alias to bind ibuffer to list-buffers
Disable auto-fill minor mode in text mode
Enable auto-revert-mode
добавил диктора и зав тсо
changed my English name from ZhangYichun to YichunZhang.
adding canned queries
agizz filder
added ref_notify to the list of mailru parameters
minor changes to Startup class for lab3.
Changes to the names of files based on Jim's lecture.
More renaming.
/ ‘server/index.coffee’
- ‘server/index.js’
zen-4 cleaning up hiring process div
Operator = in lexer
First compile tests
Range doesn't support 0 step
Sequence print as string with tests
rename runnable:byteArray
ver up
Merge pull request #8 from akb7/arkw

Arkw
Typo in service -> services
Add reload other process in lib/worker.js
gh-pages updated to almost all sections translated
Updated readme
Changed _add_sub_method/property to _add_method/property for all IndexedPropertyCollection instances
Added the MIT license
Updated the readme with a short description and a small set of current goals
add battery indicator prompt
simplify shutdown logic slightly
Dunst notifications appear on the lower right side

Also, add some more applications to start in tiling mode.

Signed-off-by: Andrei Gorgan <aliasbind@gmail.com>
Update README.md
add space between "professional" and "degree"
Merge pull request #30 from santazhang/patch-1

add space between "professional" and "degree"
Merge pull request #29 from wogong/patch-1

Update README.md
README.md: just a trivial typo fix
Update links
Update link to codeclimate
Prepare 0.8.0
Slight changes to GLSL shaders
First pass of adding business proposition flag.
add business content flag to artefact and the forms
use this to identify when an artefact belongs to the business proposition
updating artefact form
- need_id is now text box, and writable when new record.
- links to need-o-tron not shown if business content
- department/fact_checkers writable when new record
- need_id & kind moved to top of form
changing validation for business_prop & need_id
Surface Need id
updated tests as need_id is now a required field
Html Folder
Sold item count needs to be positive
The confirm shipment page now asks for the shipping carrier

It's also saved in the shipment info
The shipment summary report show the carrier and tracking number
Move the "size" and "weight" inputs

moved from the confirm shipment page to the make a shipment page

it still shows the size and weight on the confirm shipment page
Shifted values for initials
Simple animation with use of an array
Deleting to re-structure
Implement support for quest 12948
DB/NPCs: Proper flags for Night Elf Corpse

Closes #6928

Signed-off-by: Nay <dnpd.dd@gmail.com>
DB/Conditions: Missing condition for gameobject Sha'ni Proudtusk's Remains

Closes #6863

Signed-off-by: Nay <dnpd.dd@gmail.com>
DB/GOs: Missing spawn and pooling for Inconspicuous Landmark (Tanaris)

Closes #6771

Signed-off-by: Nay <dnpd.dd@gmail.com>
DB/SAI: Fix quest Reclusive Runemaster

Closes #6765
Closes #1873

Signed-off-by: Nay <dnpd.dd@gmail.com>
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore into teste2
[gc126] adding Ulduar misc fixes
Addresses brooklyn issue #16. The changes allow deploying a whirr cluster to localhost.
Merge branch 'master' of https://github.com/cosmin-dumitrache/brooklyn into brooklyn-whirr-localhost-byon
Added relevant documentation for the whirr-localhost example.
Some polish to the docs (links, proper markdown syntax, table of content).
comments and efficiency fixes for legacy compatibiity
Merge branch 'master' into brooklyn-whirr-localhost-byon

Conflicts:
	systems/whirr/base/src/main/java/brooklyn/extras/whirr/core/WhirrCluster.groovy
create 10 locations
add loop to set up multiple machines
fix spacing
fix double use of array
exclude jcl-over-slf4j from solr since it imposes wrong slf4j bindings (v1.6 which breaks other things)
Revert "comments and efficiency fixes for legacy compatibiity"

This reverts commit b3a8ae6c2595c0a3368853df9b232b64bac4f386.

In-flight collision with pveentjer changes.
Merge pull request #1 from ahgittin/brooklyn-whirr-localhost-byon

Brooklyn whirr localhost byon
disable broken test (i got an OOBE-ish message, not sure why; but it will break on build server in any case)
expose subscribeToMembers + ToChildren for policies (thought this was done?)
fix AbstractController so it is reliable, and a bit cleaner (still kinda messy); fixes broken AC test
Merge pull request #40 from cosmin-dumitrache/brooklyn-whirr-localhost-byon

Addresses brooklyn issue #16. The changes allow deploying a whirr cluster to localhost.
Merge pull request #84 from ahgittin/fix-abstract-controller

fix abstract controller, ssh/df problem
Improved representation for sensor listing with links
Only updates user data of first detected user. Other users are ignored
Consolidated floor calculations into game property called game.floor
Now tracks first engaged user with full skeleton. Robust enough to allow other users in background once first user has been detected.
29.06.2012-4
06.07.2012-1
removing comment
docs update
Merge branch 'master' of github.com:andrewplummer/Sugar
don't object keys length for multiMatch objects
simple typeof error
generate docs witht line numbers
Date.future failure fix (Issue #210)
removed unused mapped.clj
More partial refactor work
added redirect pages for paypal
bugfixes in maps.py
Added status top tab and created columns in userlist.js
Factor a timed_wait function out of shape_wait.
updated to use haxe-svn version of compiler
setting env for verify, capture and void
In the middle of adding font support / signed distance fonts / texture
fonts. based on freetype. need to fix up and clean up some....
ui: Add preferences dialog to edit Trakt's API key
ui: add quit entry in main menu
ui: remove search all types search

It removes all types search option because API does not support search
through all types in one search.
ui: change menu order
ui: querying feed-server and printing response

This patch sends uses the search method of the feed-server with the user
selected parameters and prints the different titles of the response.
Almost all credits to Miguel.
ui: change widgets order
ui: fix search issue
ui: Change type of search combo order.

Change type of search combo order to "movies", "shows", "episodes".

Somebody had to do it.

Signed-off-by: Jorge Munhoz <punkto@gmail.com>
inlined code
all tests pass
improved working dir for processes, allowed follow link in process output
Office Lappy
Moving variable declaration out of loop + type casting post variable
Nodes for navigation in Jenny corresponding to the nodes for fetch_and_carry scenario in youBot.
Component diagram for fetch_and_carry scenario: init_robot, navigation, scheduling script
Updated with draft outline of changes needed for fetch_and_carry on Jenny
Expanded max history size, added hall and h aliases for reading history
collect static files when deploying
Convert from httplib2 to requests
fix spm link
liquidluck link
aggiunto perle
Fix live-end-of-buffer-p to not use end-of-buffer 

* This had the unfortunate side effect of moving the buffer position about in the frame.
Add live-paredit-top-level-p utility fn
Don't allow nrepl buffers to evaluate regions when point is not within (or directly preceding) a form.
update nrepl-sexp-flash functionality
update yasnippet
Don't include yasnippet completions with autocomplete (they're currently incompatible). Fixes #19
update live packs to reflect dev work. See recent commits for history.
temporarily disable auto-complete in nrepl mode until I fix it - it currently dies horribly.
update live packs to reflect recent dev work. See previous commits for history
add mic-paren
enable mic-paren
remove kingtim/nrepl.el
add samaaron/nrepl
Add js2 mode.
Mark version as 1.0-BETA-1. We're on the road to 1.0 final!
update live packs to reflect recent dev work. See previous commits for history.
teach nrepl fn about a default port (6678).

To take advantage of this, you just need to make sure your `~/.lein/profiles.clj` has at least the following info:

    {:user {:aliases {"stdrepl" ["with-profile" "dev,user,standard-repl" "repl"]}}
     :standard-repl {:repl-options {:port 6678}}}

Then you can start lein with `lein stdrepl` which will boot nREPL with the same port.
update clojure mode
My setup with a little more called the starter-kit and other functions.
Update my setup by adding the nrepl package + Refacto/Cleanup.
FIX broken import
parser finished?
parser finished??
修复在framework.css.less文件中对h1,h2,h3,h4,h5,h6 设置display:inline导致popover中布局错位
完善看板功能
Not needed file
Adding manifest for css files
ultima dia 10/nov/2012
update to latest changes in the tapestry-activiti library
Consistent descriptions
Synced README with master
Merge branch 'gh-pages' of github.com:ashaniray/CargoPath into gh-pages
Issue #6

Adding reference to the (Azure) ServiceRuntime also ...
Reverting "Merge pull request #2 from IonicMobileDeveloper/master"
because the idea behind mince is to keep it open to direct support with
other databases.  With this request, relational databases would no
longer be directly supported.  It would cause confusion with switching
mince databases. sorry.

This reverts commit 313fe66cc12d41ea1b94db47f8570339950eca0a, reversing
changes made to 5817cbd4ef3148a902f64683eaec5ab98f9f49b8.

Conflicts:

	lib/hashy_db/data_store.rb
start refactoring tests for changes due to matt's tests