labofsahil/github-event-dataset-2012 huggingface dataset:
Else not needed here
Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
No reason to do that extra work, send unload packet regardless.
Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Merge pull request #278 from greatman/1.3

Fixed PlayerBlockPlacement
Removed stale "hunt" boolean.
Removed unused itrsLost code
Redirected G_CHECK_STOP_DN false -> G_KEEP_STRAIGHT
Totally working shortest-turn deviation correction
Introduced G_BUMP state and Bump recipe
More or less successfully goes home, but needs positioning refined.
use is_secure to detect https
removed unneed modules
Merge pull request #5 from ianedwardthomas/force-http-urls

force urls in metsexporter with correct protocol
Merge pull request #2 from steveandroulakis/metsexport_http

Metsexport http
use is_secure to detect https
removed unneed modules
The Site's framework domain field shouldn't contain protocol information
Edited the staging files email task function to reflect this
Home page and css changes
Import error fix
Merge pull request #3 from steveandroulakis/current_site_domain_standards

Current site domain standards
Confirmation dialog of metadata add/edits fixed
Don't show Save button if form has been submitted
Merge pull request #4 from steveandroulakis/metadata_modal_fix

Confirmation dialog of metadata add/edits fixed
Somehow fixed the mets bug that prevented an experiment with no datafile metadata entries to not save files at all
Merge pull request #5 from steveandroulakis/mets_import_nometadata_fix

Somehow fixed the mets bug that prevented an experiment with no datafile...
Merge branch '3.0' into bdp-milestone2
Merge pull request #6 from steveandroulakis/prototype_theme2

Home page and css changes
Merge remote-tracking branch 'origin/bdp-milestone2' into contextual_views
updates to staging html-elements.css for templatizer
full path fixed
removing some probably unneccessary link styling
查询时只查本部门单
Ignore the local 'build' directory
modification fichier

modification du fichier
Move original config to 'config.origin' and final config to 'config.h'
settings modification
Right manger> preserve last search while change group
Add the "source" variable in the webui_broker, for the graphs modules.
bugfix: localnet never used if no port specified. Fix typo.
Merge pull request #16 from jahrome/master

Hi ! Nice job with localnet, just what I was needing, here is just a small fix. Hope this helps.
volatile seems to be the way to use vars when using them in interrupts
debounce the button press. note the "static" declaration. perhaps the last_interrupt_time assignment should be in the if clause
sleep when NOT interrupted. do something else ... else
GPRS.pde: Version bumped to 1.0
* Removed unused definition BUFFSIZ
* Moved all defines to the top of the code, just bellow the includes
* The phone numbers are now in defines
* Introduced a char array allowed to keep the phone numbers for the actual application
* Removed phone_num and phone variables, replaced by phone_str and phone_ptr
* read_resp() now accept one int argument. Based on it, it decides, should it continue reading after the new line character.
* Moved the SMS MODE set before the Display messages set in configure_gprs()
* parse_phone() now uses global variable, so it does not need to return anything
* Added new function check_sms() which validates the text in the SMS and triggers parse_phone() and check_number()
* Moved the sms validation code into check_sms()
* Added new function check_number() which is responsible for validating the incming number.
* Added new function add_numbers() to initialize the allowed[] array with the phone numbers from the defines above
* Added DirectToSerial() function for debugging and manual testing

TODO:
* parse_phone() should work with local variables
* get rid of list_sms() so we can read SMS every time we receive one
* add the code for the relay handling(lock/unlock/start/stop)
some change at routing
Remove unnecessary request parameter
small change to css and logo
Add getobject Api
Prevent default behaviour on mousedown.

Fixes mousedown -> mousemove -> mouseup on single Chosen in FF. Issue accurred only in jQuery version. #492
Merge branch 'master' of https://github.com/yolk/chosen into yolk-master

Conflicts:
	chosen/chosen.jquery.js
	chosen/chosen.jquery.min.js
	chosen/chosen.proto.js
	chosen/chosen.proto.min.js
added stalked
merges
working cli interface for the testing part of the system. same for compare not far behind it
products 加载问题
new bin for intall latest node and npm version
list and create wine look and feel enhancements
continue on app,making it prettier and adding ability to comment on a wine
add m_period for order thread
Merge remote-tracking branch 'upstream/draft-16-master' into develop
No more easy_install
Merge pull request #18 from chrisdev/develop

Develop
Typo in comment.
It is valid to add an aggregate to a zone which has no matching
networks.
修复断电下载时，在100%的时候暂停，会无法完成的问题
完善新的图片下载器
Programs for course 'Parallel and distributed agorithms'
Programs for course 'Machine learning'
New homeworks for course 'Algorithms and data structures'
Changes in project structure
gitignore settings
better scripts parsing
bahasa branch
Improved core TimeSpectra functionality, including working timeseries/interval axis
Implement interrupt handling
Blend mode 0x0000
Fix disassembly for DSLLV/DSRV/DSRAV
DSRAV/DSRLV/DSLLV/
Rearrange DSxx32 functions
允许拖拽改变图标顺序
fix bug using number compare
Added sounds and updated methods like the collide method; worked on AI animation
moved regex to if statements
tidied nginx.conf
Major changes. See my notes signaway.js file.
DirectAction machinery configured (no actions work)
Wire up the 'hello' direct action to the main page.
Added timezone adjustment
Añadido Caso de uso Actualizado

Añadido el diagrama de casos de uso con más funcionalidades del
programa.
compress progress2
compress js/css done.
new echoes filename
Adding Examples project.
Fix CMAKE_PREFIX_PATH not work on android.

Because it set these:
set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
Fix not work for /opt/android-ndk.

Because list will ignore "", so foreach will not use "" suffix.
Add coolaudio .so file copy for target.

Rename copy_coolaudio_android_java_files to copy_coolaudio_android_files, and it will copy both java files and libraries.
Update samples/CMakeLists.txt.
Set android libraries out dir to CMAKE_BINARY_DIR/Android.
Fix FindOpenAL vars name.
Add AndroidCommon.cmake.

Because android toolchain file updated, and it remove set_output_root function.
Remove DECL_INIT_ENDIAN.
Move particle-conv win32 check.

Move to CMakeLists.txt in root dir.
Add AndroidCommon in CMakeLists.txt.
Fix some warning.
Name the structs.
Add headers in libnge2.h
Fix audio_android.c.

Rewrite LOGI and LOGE to inline functions.
Add audio_openal.h for declaration.
Fix audio_openal.cpp.

Add headers.
Fix audio_openal_wav.c.
Change coolaudio library to static on android.

Because it depends on nge2 but nge2 also depend on it.
Update samples/CMakeLists.txt.
Create target dir install android dir.

add_nge_executable create dir base on target's name instead of android.
Copy openal to executable dir on android.
Adding d2to1's tages/branches/trunk

git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@13614 fe389314-cf27-0410-b35b-8c050e845b92
Several changes that I accidentally committed to d2to1's old repository. See the changes to the changelog for more details.

git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@15173 fe389314-cf27-0410-b35b-8c050e845b92
Preparing release 0.2.6

git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@15174 fe389314-cf27-0410-b35b-8c050e845b92
Finish release of 0.2.6.


git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@15176 fe389314-cf27-0410-b35b-8c050e845b92
Fix slight formatting bug

git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@15177 fe389314-cf27-0410-b35b-8c050e845b92
Fixes a bug where entry_points in a setup.py are blanked out if there are no entry points defined in setup.cfg.

git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@15185 fe389314-cf27-0410-b35b-8c050e845b92
Preparing release 0.2.7

git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@15186 fe389314-cf27-0410-b35b-8c050e845b92
Finishing release.

git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@15188 fe389314-cf27-0410-b35b-8c050e845b92
Merge branch 'master' of github.com:iguananaut/d2to1

Conflicts:
	README
	d2to1/util.py

git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@19547 fe389314-cf27-0410-b35b-8c050e845b92
Bug fix - wrong path for the boot loader package
replaced added ! and non-! methods with validations
txn40301
txn40301
Add txn10102
Merge branch 'develop' of https://github.com/iisihub/hncb_rod.git into develop
Tumblrテンプレ修正
Tumblrテンプレ修正
PRページ修正
PRページ修正
new ducksboard shortcut
changing version to 0.1.1
updated grunt version
EditorManager inicio.
Cargador de mapas.
Stamp version 0.1.1 with status "stable"
Add archive.sh for packaging up releases
Added Dave's design
Carel is pushing the test in order to have a look at it on his own PC
Merge branch 'master' of https://github.com/invoketech/store.git
Reformant copyright text for better consistency.
Update to new bundler based gem distribution.
say command:
say command:
say command
say command
say command
say command
say command
say command
say command
say command:
Don't take notes in PM
add room
.
Display in dialog box the river name we are editing
#15 : FS River advanced tab parameters are not saved
created collection entities and models in correct context
get only objects with id from cache
moved from save/update to save
implemented reversed logic for fetch than for save
Added SniffException
Work on Sniffer
deleted rename_column file
workaround for omp with vc
students' compareTo updated
working on some kind of entry based filtering
cleanup
new dev build
Moved curl to bootstrap
Trying relative URL for logo image.
now with the correct regexp
Changed ReadDir return type.
Split fs package into multiple files.
Moved entry conversion code into fs.
Fixed build errors.
integrated config from ok100
Made TouchPanel work with IList<TouchLocation>, therefore you don't have to do a full array copy with each touch state request.
Add stylish black css and edit, delete, new images
added an example for Handler
grafiikan teko suuresti muutettu, paljon parempi nyt
countFiles and main changed
Import Tom Wu's version 1.3.

 * Fixed bug when comparing negative integers of different word lengths.
Broken test case for routes in group/list combo

See ab34c2945196c51bcb9850163395a9c7b188ddde
Products now span four columns in products.php
fdsdffds
commit and push junk2.txt from testing/testing1-a
Fix range on tiletypes and make it saner for both plugins.
remove Modernizr gem source
remove Modernizr gem source
Added tab movement commands

  w0 - move tab to start
  w$ - move tab to end
  wh - move tab left
  wl - move tab right

Close tabs to the left and right have been renamed:

  wH - close tabs to the left
  wL - close tabs to the right
Bump 1.37.0.3
wO -> wo
.ssh: added our gateway in main .ssh/config, probably a ssh bug :(
adding support for derived variables
[AS7-5556] Where we convert to a String ensure we set the charset to UTF-8 for both processes.
Move OSGi tests into a private area
[AS7-5012] cli expects invalid type for mod_cluster capacity
[AS7-5012] cli expects invalid type for mod_cluster capacity - tests fix
Fix deployment overlays XML bug
Fix bug with domain mode composite operations
AS7-5497 added exception wrapping for notSupported even for tx == null
Break jsf injection out into its own manven submodule so it can live in its own jar.
Create jsf injeciton module.
Modify poms for jsf injection module.
[JBTM-1156] replace occurences of 127.0.0.1 with localhost
[JBTM-1166] re-enable rest-tx module
Removed debug task
Fix and update mod_vcard_ldap docs

There's no FIRST field!
Also, VCARD_MAP is still treated as strings so revert the default.
Fix ldap vcard search - eldap returns lists so match the maps with lists for now. TODO...

TODO: could probably make eldap return binaries by changing the gen_tcp/ssl default
since LDAP is a binary protocol anyway...? what about ASN1??
Added new sketches.

Added test sketches for an LED bar graph, the 20x4 character LCD
and servo motors.
Added color LED demos.

Added a demo to smoothly transition the color LED from color to color.
Added a second demo to do a random walk in RGB space. Added a Makefile
to be able to compile and upload sketches from the command line.
Set initial LED color in setup().
Added analog input sample from Arduino.

Added a slightly tweaked version of the AnalogInput example from
the Arduino IDE>
Plugin sync and elsm_web
Removing node-less package install, this could be a timing issue
Remove form param from view_context, fix BooleanFields

This requires an update to the Bureaucrat gem. See here:

https://github.com/jchilders/bureaucrat/commit/1c5ea6131683ae79c9796cafccca067773f99ed0

Previously, BooleanFields were failing validation if required but set to
false. The above commit fixes this.
Added instructions to README. Made it easy to change the source repo.
ServiceDescriptorFactoryCombinators.requestLogging with default parameters is added
Remove unused symbols, export warm start address.
Check in Woz monitor binary for jmon.
Fix printing of data bytes for 4 bytes instructions.
(#15731) Add clarifying comments to host.rb

Prior to this commit it was unclear that the existing :fingerprint
element of the pson hash was still around for backwards compatibility
for as of yet unknown external consumers of the existing api. This
commit makes it clear that that's why it's still around and that we
don't have any known internal consumers of that api.
Functional create new game & join game
Merge branch 'master' of github.com:jellea/42seconds
Start game schreen
fixed merge
Merge branch 'master' of github.com:jellea/42seconds
Partes de Centro Realizados
Updated parameters analysis example.
Update to traveler
Various updates
Various changes.
Adding github various changes.
Various creenrc
Separate file for github credentials.
Now stored the last reproduction on localStorage of the browser
bundle update
Allow to retreive the local path, note:

this is only working for local storage, if there are future
storages this might not work. There could be code to copy
the file locally temporary if the local storage location
is required. But maybe the carrier module should be rewritten
so that there is always a local storage plus optional
external storage locations (uploaded to a CDN).
For fingerprinting it is necessary to have a local copy.
bundle update and fingerprint generation code
script to generate fingerprints
readme to root directory
add back to project link on example page
Added python code generation.
styling bottom
adding outlines and some info on how mithgrid works
rpkm expression scripts
Adding README.md, removing node_modules
updated README.md
Fixing message handling ( one listener )
moved state change (reset!) out of 'move'
don't need 1g at the moment
release document body after couchstore_open_doc_with_docinfo
Initial add of django-relationships
Merge branch 'dev' of github.com:GeoNode/geonode into relationships-clean
Removed unused url in geonode.urls
Merge branch 'relationships-clean' into dev
Follow logger configuration conventions and move notification checking code to the place where it is used ,refs #501
Merge branch 'dev' of github.com:GeoNode/geonode into actstream-clean

Conflicts:
	geonode/settings.py
	geonode/urls.py
More thoroughly test Htmlroot/Htmldir combinations.
Add a test that will exercise the setting of Htmlfileurl.
Added library path to conf.py
Comment out PPC and SPARC code in core.cpuid.
Add functions to core.cpuid to detect AVX2, HLE, and RTM.
Minor core.cpuid documentation improvements.
Mark core.cpuid @trusted nothrow.
Wrap some core.cpuid information in const properties and schedule the old public fields for deprecation.
Only check cpuid.{EAX = 7, ...} when max_cpuid >= 7.
Merge pull request #292 from alexrp/cpuid-improvements-new

A number of core.cpuid improvements.
add makefile for Win64
Win64 additions/corrections
revert stuff that inadvertently crept back in
Win64 doesn't use minit.obj
Fix monitor_.d/critical_.d for Windows, remove C implementation.
Update Makefile for Win32/Win64.
Merge pull request #302 from ibuclaw/monitord

Fix monitor_.d/critical_.d for Windows, remove C implementation.
Added capturing of undo state
Git-ignore pyc and results dir.
less conditionals, add support for leading decimal
added vmsize printing when idle.
printing pid immedialy when verbose, waiting for it to appear is awkward.
Add some thoughts to the readme.
Scrapping asset minification for the moment
adding options object so directories can be ignored
Updated to not use manual memory management with singletons. Removed declaration of nav controller that static analyzer says is never used.
Fix timing code in cancel_tasks.ml

Signed-off-by: John Else <john.else@citrix.com>
Add some comments.

Signed-off-by: John Else <john.else@citrix.com>
Added order by event_start (fixes 221)

Also escaped tag (no issue)
Removed debug code
Fixed indentation
Writing automatic tests
Don't move UI controls if old parent is the same as new parent
a picture is added to upload folder so our upload folder is also inside the repositoryt
upload folder added :@
Merge branch 'master' of github.com:jonassanoj/dbpro
Implement model/controller logic for open groups.
small changes.
Finish implementing group.viewable_by everyone
Add edit group button.
Merge pull request #35 from enspiral/feature/open-groups

Feature / Groups can be visible to everyone
fixed dasboard multilinedispay bug
Merge pull request #36 from AaronThornton00/master

Fixed display issues on dash
Grey closed motions
Merge branch 'master' of https://github.com/AaronThornton00/Loomio

* 'master' of https://github.com/AaronThornton00/Loomio:
  Grey closed motions
BUGFIX: dashboard not displaying motions when all motions are closed
Merge pull request #38 from enspiral/bug/dashboard-broken

BUGFIX: dashboard not displaying motions when all motions are closed
added line-hight
Include catcher filter by default
Use new api
Update css-explain
Update Source/VotablPhone.sln
moved into source folder
meh, it is what it is :D
Fix bound checks.
Only the JNI high compressor does not support exact length compression.
xxHash fixes and tests.
Grunt: Ignore ajax content test files in htmllint task
Position: Fix markup for deprecated tests. Insert/remove some new lines to make comparision to position.html trivial
Accidentally removed licenses.
Build: Include ui/.jshintrc. Fixes #8687 - .jshintrc files not copied to dist.
Allow custom post slug YAML header
Merge branch 'custom-slug'
Allow for a path-based post URL publishing scheme.

This change adds a prompt question to the `delposto create` sequence; it
asks whether or not the user wants the default date-based post URL
scheme, YYYY/MM/post-slug. The answer is written to the site's meta.json
and used in the `publish` process (I left `preview` untouched).

If the date-based URL scheme is turned off, posts' URLs will be created
based on the path to the draft being published, so:

`delposto draft something` results in the default behavior, but with
the post being published as /something/index.html.

`delposto draft some/nested/thing` results in the post being published
as /some/nested/thing/index.html.

The trailing slash behavior for the `draft` command is preserved, so
`delposto draft some/nested/thing/` creates a file
`drafts/some/nested/thing/index.md`, and you can put other files next
to it so they all get published together in
`/some/nested/thing/slugged-post-title/`.

The cleanup done after publishing a post is still limited to removal
of the post file or the post directory itself (for a trailing-slashed
draft). Nested directories aren't removed, ostensibly because the
assumption is that if you've nested a draft, you'll likely have other
posts/drafts in the same directory structure at some point. In
reality, this is simply a case of developer laziness on my part, but
I think I can get away with making the other claim sound legit :-)
Change boolean dateBasedUrls to string postUrlType ("date" or "path") for generating post URLs
Merge pull request #2 from revin/custom-paths

Custom paths (and slugs)
Fix confusing indentation.
1.1.10
set next dev snapshot
Add the fields createdBy and changedBy in the class Category(model and mapper)
Clean and PHPdoc in the class DepartmentController in the module admin
U.C. News, Creating class model and mapper
U.C. News, Creating Class NewsController, Form and view
ADM U.C. News Implementing the class model, controller and view and changes in the file js
ADM, U.C. News: Updating class model, mapper, controller and views(create and update)
ADM, U.C. Privilege Creating model, mapper and patch
ADM, U.C. Privilegio Creating class controller and view at their status initial, and Creating file js
ADM, U.C. Privilege: Implementing Read, Create and Update, and Creating the views(read, create and update) and form
AMD, U.C. Privilegio: Implementing method remove and Cleaning condition protocol POST
ADM, U.C. Privilege: Test Selenium (create and update)
ADM, U.C. User Group: Creating class model and mapper
ADM, U.C. User group: Changing file navigation_admin and the layout (header)
Selenium, Creating method random in the class SeleniumTestCase
ADM, C.U. User Group: Creating all methods(CRUD) in the class controller, class views and file js
ADM, U.C. User Group: Plugin jQuery MultiSelect
AMD, U.C. User Group: Implementing the funcionality to save table many to many
ADM, U.C. User Group Adding plugin jquery jquery ui multiselect widget and deleting plugin jquery multiselect

Signed-off-by: victor villca <victor.villca@swissbytes.ch>
ADM, U.C. Privilege: Fixing and cleaning validation side client
ADM, U.C. User Group Implementing creating and update with table many to many
removed calls to built-in file()/io.FileIO() in favor of read()
DatabaseBacked interface needs to be a Plugin object
ThreadedStatistics needs to be a Plugin object
use cPickle instead of pickle in Statistics
simplify default metadata loading
raise NotImplementedError from unimplemented plugin interface methods
fixed Metadata interface definition
fixed several Statistics bugs
adding some tests for Plugin.py
move MetadataConsistency/RuntimeError exceptions into Plugin.py so we don't depend on a particular Metadata plugin
use os.path instead of posixpath in Plugin.py
DirectoryBacked tests and fixes
tests and fixes for XMLFileBacked
StructFile tests and fixes
made plugin tests inherit from plugin interface tests
bcfg2-admin: Add options from 75c6e2a to man page

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Hostbase: Avoid DeprecationWarning

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Options: Suppress warnings in bcfg2-admin init

The warning for missing bcfg2.conf is just ugly when trying to
initialize your bcfg2-server via bcfg2-admin init. This commit prevents
us from spamming the new user with irrelevant information.

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
added unit tests for INode, InfoNode
abstracted out some common test stuff into common.py
add whale animation
adjust jump vel, gravity and enough_space because of bigger whale
correction graphiques
Modifications graphiques
traduction de Whats new
Traductions
removed 'names = TRUE' from genfromtxt calls
Organize into cmd/ and pkg/ subdirectories.
Add some pipe functionality.
Filter home from LP reports.
fix segfault if there is no active session
Cambiecito en depuracion.R
Cambió de lugar: a misc
Cambios en rep 3 y anova:

 - En rep 3 se corrigió un error importante relativo al ejercicio 1.b
 - Además se mejoró la preparación del repartido, creando el archivo objetos.R que se puede correr de una con source y genera un archivo 'aux' completito (habría que hacer esto dentro de datos.R, me olvidé).
 - En anova hice algunos cambios menores de notación, pero además borré una fórmula (línea 91 aprox.), porque no se entendía para nada.
added 'Ed Rush - The Dreadd' to dubjungle
added 'Omni Trio - Breakbeat Etiquette (London Steppers Remix)' to dnbchill
Trying to do a little fancy footwork in the deploy script to allow for swapping around the Gemfile to add the JRuby support.
Source RVM so we can use it on deploy.
Set the Gemfile for JRuby.
Restored Gemfile.
Old EKF will run, although particle filter will still be initialized.
Override tab settings for ruby
update mp3infp.txt

Add limitations of the current version.
[#2784] reset current time to 0 when media is changed, and only pause or play if we are in the inverse of what we need.
No Bug - Use proper `this` context in headers
[t2739] Removed beta message + timeout on first run
[t2377] More review fixes
add example in README for following_tags
updated mobile file
Fix: Unicode conversions
Feature: Update Admin interface
updated width on menu images
new winery page
WIP of destroying bullets. Good night.
QuakeCamera removed, code updating Spaceship position moved to Spaceship class
ctrl-k,d
Merge branch 'master' of github.com:kamilk/asteroids

Conflicts:
	Asteroids/Asteroids/SpaceshipCamera.cs
Added in tri color led light sensor
Master layer toggle works 
logo! very very first draft
ignore stuff
more mapping!
missing import caused crash with photos
Merge branch 'ux2' of github.com:karlproject/karl into ux2
add backto link to forum view
change query impls
builder: disable Esc key (new exp setting). closes #108

- new param / checkbox in settings, disable escape
- should not affect existing scripts (same as before: allow quit)
feature: enable escape (just reverse the logic)
NF: merge branch 'feature-enable-escape-quit'

new experiment setting to control whether the subject can break out of exp

* feature-enable-escape-quit:
  feature: enable escape (just reverse the logic)
  builder: disable Esc key (new exp setting). closes #108

Conflicts:
  settings.py: needed to add back 'enableEscape=True,'
RF+DOC: remove sha (python 2.4 version of sha1 digest); update changelogs
DOC: typo & mailing list link

noticed by AJ
DOC: info on how to add documentation
DOC: recipe for adding a web-cam

just copy & pasted from mailing list, not tried (easy_install opencv did not work for me)
DOC: recipe for scrolling text (from user list)
BF: removed unecessary print statements (from debugging) in visual
Merge remote-tracking branch 'rem-jeremy/master'
DOC: changelog
ENH: ExperimentHandler.saveAsWideText now using extraInfo and conditions params
BF: DataHandler.addDataType no longer tries loop over unicode strings
Merge pull request #120 from williamhogman/upstream

BF: DataHandler.addDataType no longer tries loop over unicode strings
DOC: removed multiflip from documentation and fixed some EOLs
BF: Window.setColor didn't know how to scale different spaces correctly

if named colours or RGB255 then should not be /2+0.5
BF: fixed (unimportant) erroneous error message about combining hex colors
Merge branch 'master' of github.com:psychopy/psychopy
Fixed bug in which fieldPos of Builder dot stimulus component couldn't be changed each frame

fieldPos attribute of Builder dot stimulus component couldn't be
changed each frame. Due to differences between handling of this
attribute called fieldPos as opposed to simply pos in the patch
stimulus.
Also fixed some typos in a tool tip for the patch stimulus hints and in
one code comment.
Merge pull request #122 from m-macaskill/master

Fixed bug: fieldPos of Builder dot stim couldn't change per frame
Add stream operators (Requested #2430)

Add output stream operators (<<) for Rect, Size, Matx, Vec.
I can't add operations for cv::KeyPoint.

And putting together all operator<<.
(Point_, Point3_, Matx, Vec, Size_, Rect_)
IE 8 Filter fix
User activation completed
added Varietal Servlet and button
shift-drag feature
Adding complete setup script
Removing commented deletes
First Commit
Merge branch 'master' of https://github.com/kevinAlbs/HackNY

Conflicts:
	index.html
WIP for MVs: Create a special init fork for a materialized view.

This will be used to force the relisvalid flag to false when the
materialized view is first referenced.
User show view: Added white space
Add var to add extra eldoc safe commands.

This fixes a bug where nrepl-complete (or other completion mechanisms) didn't
trigger eldoc display.
Merge branch 'extra-eldoc-commands' of https://github.com/metajack/nrepl.el into metajack-extra-eldoc-commands
add eldoc require
Added pathogen bundle
[crane] srm_151_div2_250
Merge pull request #1 from kiyosue/basercamp

1.2形式の取得のままの所を修正
push先がかわったので、確認かねて、versinを変更
コンテンツ部分 content_for_layout を表示出来る様に修正。元コードの影響範囲が未確認なのでコメントアウトで残してます。
step2まで遷移のための改修。
セキュリティーチェック csrfを無効可
削除フォルダの調整
database.phpのdatasource取得の方法の変更
chmodができないときのwanningの抑制
database.php作成時に、CakePHP2形式に変更
CakePHP2.1以降fetchを使うのでそちらにあわせる 元の影響範囲は要調査 TODO付き
/lib/Cake/Model/Datasource/database の書式にあわせてファイル名からDboを削除
/lib/Cake/Model/Datasourceにあわせて階層を一つ上に
ファイル名移行したので削除。てかリネームでいけた？
DBセッティングのチェック先をdriverからdatasourceへ変更
不必要なpublicを削除
デバッグが残っていたので削除
メソット名がかわってたので修正 要確認 TODO
database周りの修正、driver -> datasouceへ
不必要なDSを削除
必要な設定を追加、名前の変更等の反映
設定の追加
App::import から App::usesへ
インストーラが動くための暫定しょり 要確認 TODO
メソッド名が変わってるためしゅうせい
Added initial Node.js server code. It uploads and displays images
Fix a few warnings/errors in the test-suite using Solaris compiler

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12993 626c5289-ae23-0410-ae9c-e8d60b6d4f22
implement CouchAccess.copy
added ranged annotations to rickshaw
Merge pull request #102 from gt8073a/master

added ranges to annotations
Update README.md
update built libs
Removing trailing comma. Technically not valid ECMAScript which can cause unexpected behavior in IE. (https://developers.google.com/closure/compiler/docs/error-ref)
Updating build after removing JSC_TRAILING_COMMA errors
Merge pull request #109 from rowanc/fixing_trailing_commas

Fixed Trailing Commas
clean up whitespace
refactor Rickshaw.Graph.Ajax to support subclassing
update built libs
tweak point border style to sync up with gh-pages branch
add better support for node
update built libs
Update README.md
look at x property when finding active data point for hover details; fixes #126
Merge branch 'master' of github.com:shutterstock/rickshaw
fix leaking globals; fixes #129
upgrade d3 for examples
Merge remote-tracking branch 'upstream/master'
correct f stochastic calc
Updated the question template to display some meta data about each question
@B2 improved polling architecture
Installed vim-mustache
fixed an issue with private comments
change the logic of comments updating
whoooohoooo
WHADUP
test change
Merge remote-tracking branch 'origin/master' into Rishi
fuck
FTS
Merge remote-tracking branch 'origin/master' into aki
I did some stuff earlier
started login screen
started login screen etc
Merge remote-tracking branch 'origin/master' into aki
before removing cancel button
after removing cancel button from login screen
Just returned netid from the text field successfully!!!!! :D
add basic emacs config
probando view
probando view
template
template
template
template
template
template
template
template
template
template
template
template
template
template
optimize flags.
optimize flags
set root dir on command line.
-o -O -h -v
better fsetbinary()
connection timeout
updated todo file
updated ecc.php and exp.php
updates
prueba
prueba
hola
hola
hola
hola
hola
fixed extension limit
Добавлена строка поиска

Функция поиска находит населенные пункты по названию, введенному в
поисковую строку, и масштабирует карту так, чтобы все точки попадали в
область видимости.
now abort button becomes close button when download is completed. 

git-svn-id: svn://svn.netsurf-browser.org/trunk@13510 d004b94f-0d10-0410-95b5-d60e4a4a7a9a
Removed unused plotter members.

git-svn-id: svn://svn.netsurf-browser.org/trunk@13511 d004b94f-0d10-0410-95b5-d60e4a4a7a9a
Added GD Plotter stub.

git-svn-id: svn://svn.netsurf-browser.org/trunk@13512 d004b94f-0d10-0410-95b5-d60e4a4a7a9a
fix incorrect type in message loading

zlib has changed 
typedef voidp gzFile;
to 
typedef struct gzFile_s *gzFile;

historically the gzFile *fp has efectively expanded to void**fp
The compiler considerd void ** to be identical to void* as void cannot 
be dereferenced and compilation suceeded. 
With a concrete type it does not work.



git-svn-id: svn://svn.netsurf-browser.org/trunk@13517 d004b94f-0d10-0410-95b5-d60e4a4a7a9a
Restructured the plotter driver struct and declared misc functions static within the vdi driver. 

git-svn-id: svn://svn.netsurf-browser.org/trunk@13519 d004b94f-0d10-0410-95b5-d60e4a4a7a9a
Adjusted for changed plotter members. 

git-svn-id: svn://svn.netsurf-browser.org/trunk@13520 d004b94f-0d10-0410-95b5-d60e4a4a7a9a
add some asserts, fix some boundary issues
user or admin can now delete an ad
Add pg Gemfile for Heroku
SD
- modified the twitter feed to look nicer
- still working on some minor twitter stuff
added home folder, index view, closed #5
:`:wq
Merge branch 'development' of https://github.com/larrybuch/one-up into development
fixing lint whining and changed j to $
update gitignore for settings dir from eclipse
factor ConnectionDialog out of REPLView; make it so you can paste a port number into it
ensure that clojure.repl is required before calling clojure.repl/pst
Merge commit '4a0c6'

Conflicts:
	ccw.core/src/java/ccw/repl/ConnectDialog.java
Merge commit 'b3946'
* Change name to alt
 * Display a random sponsor in case we don't have javascript
 * Upgrade default theme to jquery 1.7.1
Merge pull request #200 from iseppi/cleanup-sponsors

Clean up sponsor logos further
 * Use mapped attributes to replace existing functions so that they use SQL
 * Replace references to old function calls with references to mapped attributes
 * Change good_payments and bad_payments from functions to relations
Merge pull request #201 from iseppi/optimise-invoice-model

Optimise Invoice model by extending the model to do more with SQL
Merge pull request #14 from zookeepr/master

Merge upstream to lca2013
enable wiki and programe links
Merge pull request #15 from stevewalsh/MakeWikiGoNow

enable wiki and programe links
 * Change name to alt for logo blocks
Merge pull request #16 from iseppi/fixup-lcainfo

 * Change name to alt for logo blocks
 * Remove static links from schedule sub-menu
Merge pull request #202 from iseppi/remove-non-schedule-links

 * Remove static links from schedule sub-menu
Merge remote-tracking branch 'upstream/master' into lca2013-master
More i18n minor fixes:
*Moved portuguese to its right place (alphabetical order).
*Commented out (in menu) four languages for which we have no translation at all yet: Dutch, Korean, Romanian and Ukrainian (easy to bring them back as soon as we have some translation!).

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45422 954f8c5b-7b00-dc11-b283-0030488c597c
fix for memory leak when using the bmesh python api - would allocate customdata layers and overwrite them when converting a mesh to a bmesh (without freeing).


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45424 954f8c5b-7b00-dc11-b283-0030488c597c
Fix for setting active UV, vertex colors and probably shape keys from python API.

It was an error how index of requested layer was searching: iterating used to start
from the beginning of data layers datablock, not from index at which requested
layer type actually begins.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45425 954f8c5b-7b00-dc11-b283-0030488c597c
Fix #30804: nodetree.links.new() incorrectly disconnected or allowed to connect
multiple links to a socket when the arguments were passed in order:
(input socket, output socket) instead of (output socket, input socket)

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45426 954f8c5b-7b00-dc11-b283-0030488c597c
DO not store Flipped flag for pose paste operator in operator redo storage,
so mixing pasteing flipped and non-flipped will work properly.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45427 954f8c5b-7b00-dc11-b283-0030488c597c
Cycles: add rejection of inf/nan samples, in principle these should not happen
but this makes it more reliable for now.

Also add an integrator "Clamp" option, to clamp very light samples to a maximum
value. This will reduce accuracy but may help reducing noise and speed up
convergence.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45428 954f8c5b-7b00-dc11-b283-0030488c597c
Cycles / OpenCL:
* Enable __KERNEL_SHADING__ per default for OpenCL.
This enables basic shading (color, emission, textures...) for AMD cards. 

You need the latest AMD catalyst driver in order to have this work. 

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45429 954f8c5b-7b00-dc11-b283-0030488c597c
Fix windows compile error in previous commit.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45430 954f8c5b-7b00-dc11-b283-0030488c597c
spherical panoramic fix
note: this was never correct and not a single soul bothered noticing that.
not really a surprise, this mode is more for debug than for anything else.
to test go to (game engine) Render -> Dome Mode -> Spherical Panorama

thanks to Aldo Zang to help me spotting the problem.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@45431 954f8c5b-7b00-dc11-b283-0030488c597c
Example for MVC
Merge branch 'master' of https://github.com/lechip/OdeToFood.git
cassandra cookbook is bad!
updated edit aws
多余东西删除掉
Little traslation "HOME" /post
Merge pull request #3208 from movilla/69

Little traslation "HOME" /post
I think possibly "https://github.com/diaspora/diaspora/issues" better than "http://bugs.joindiaspora.com/"
use back-to-top initializer, fixes #2840
Merge pull request #3209 from movilla/69

I think possibly "https://github.com/diaspora/diaspora/issues" better than "http://bugs.joindiaspora.com/" [ci skip]
remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked)
i've submitted an issue to the gem.  hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
spelling error.  running cukes are important.
new publisher if is you are beta, not just admin
Change IRC link in Readme to the wiki page [ci skip]
add FeatureFlagger to HomeController instead of making calls to Role directly
use zoom-in / zoom-out cursors to signify favoriting [ci skip]
hover state on info in profile [ci skip]
pulsate control to add new post if no posts present
new publisher if person is admin as well
add more og markup; send over large image re FB's request
TIMELINE TIME.
don't post to feed; post to joindiaspora OG tag.  also, whoever has the diaspora OG tag, can i haz?
single instead of double quotes [ci skip]
AUI-682 - In IE9, Image Viewer continues to play audio after closing/navigating Image Viewer
AUI-682 - Build files
AUI-682 - In IE9, Image Viewer continues to play audio after closing/navigating Image Viewer
AUI-682 - Build
Merge branch 'master' into pull-request-87-AUI-682
Merge branch 'master' into pull-request-87-AUI-682
AUI-682 - Removing IE conditional check; Other browser may be effected
AUI-682 - Build files
added stripe customers
added stripe customers #2
Add extended FRU decoding.

FRU decoding is now done according to the Platform Management FRU
Information Storage Definition. This is not yet implemented fully,
e.g. multi record fields are missing.
Further work on FRU info decoding.

This will add support for 6bit packed ASCII as well as proper
type specs of fru info returns. The multi record area is now
decoded basically, but no field decoding is done yet.
Mavenified, yay!
Linked list additions, animations for stat values
synthesis ready top level tester for coin counter
reverse value of decimal point signal; add reset
add reset; add max of 1000 (10.00) to value
layout
layout
layout
layout
addition of Inge for cover art
Add a test that the correct sequential slices are returned.
Fix test off-by-one error (slice upper limits are non-inclusive).
Fix wrong name in comment.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165224 91177308-0d34-0410-b5e6-96231b3b80d8
Hoist some grossly duplicated code from the COFF/ELF/MachO streamers into MCObjectStreamer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165225 91177308-0d34-0410-b5e6-96231b3b80d8
The alignment of an sret parameter is known: it must be at least the
alignment of the return type.  Teach the optimizers this.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165226 91177308-0d34-0410-b5e6-96231b3b80d8
In my recent change to avoid use of underaligned memory I didn't notice that
cpyDest can be mutated in some cases, which would then cause a crash later if
indeed the memory was underaligned.  This brought down several buildbots, so
I guess the underaligned case is much more common than I thought!


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165228 91177308-0d34-0410-b5e6-96231b3b80d8
Add instruction itinerary for the PPC64 A2 core.

This adds a full itinerary for IBM's PPC64 A2 embedded core. These
cores form the basis for the CPUs in the new IBM BG/Q supercomputer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153842 91177308-0d34-0410-b5e6-96231b3b80d8
Use full anti-dep. breaking with post-ra sched. on the embedded ppc cores.

Post-RA scheduling gives a significant performance improvement on
the embedded cores, so turn it on. Using full anti-dep. breaking is
important for FP-intensive blocks, so turn it on (just on the
embedded cores for now; this should also be good on the 970s because
post-ra scheduling is all that we have for now, but that should have
more testing first).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153843 91177308-0d34-0410-b5e6-96231b3b80d8
Add ppc440 itin. entries for LdStSTD*

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153844 91177308-0d34-0410-b5e6-96231b3b80d8
Set the default PPC node scheduling preference to ILP (for the embedded cores).

The 440 and A2 cores have detailed itineraries, and this allows them to be
fully used to maximize throughput.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153845 91177308-0d34-0410-b5e6-96231b3b80d8
Fix typo.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153846 91177308-0d34-0410-b5e6-96231b3b80d8
This commit contains a few changes that had to go in together.

1. Simplify xor/and/or (bitcast(A), bitcast(B)) -> bitcast(op (A,B))
   (and also scalar_to_vector).

2. Xor/and/or are indifferent to the swizzle operation (shuffle of one src).
   Simplify xor/and/or (shuff(A), shuff(B)) -> shuff(op (A, B))

3. Optimize swizzles of shuffles:  shuff(shuff(x, y), undef) -> shuff(x, y).

4. Fix an X86ISelLowering optimization which was very bitcast-sensitive.

Code which was previously compiled to this:

movd    (%rsi), %xmm0
movdqa  .LCPI0_0(%rip), %xmm2
pshufb  %xmm2, %xmm0
movd    (%rdi), %xmm1
pshufb  %xmm2, %xmm1
pxor    %xmm0, %xmm1
pshufb  .LCPI0_1(%rip), %xmm1
movd    %xmm1, (%rdi)
ret

Now compiles to this:

movl    (%rsi), %eax
xorl    %eax, (%rdi)
ret




git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153848 91177308-0d34-0410-b5e6-96231b3b80d8
Revert commit r160307. We decide to move builtins selection to the backend.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@160352 91177308-0d34-0410-b5e6-96231b3b80d8
Implement r160312 as target indepedenet dag combine.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@160354 91177308-0d34-0410-b5e6-96231b3b80d8
Do not include multiple -arch options in CPPFLAGS.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@154070 91177308-0d34-0410-b5e6-96231b3b80d8
small fix to is_pe so that it will work after seeking elsewhere in the file
small change in __init__ to test that is_pe works after pe_get_optional
Merge branch 'is_peFix'
学习异步处理
Oops; forgot to delete that.
Remove conflict markers.
Merge branch 'refs/heads/runtime-sandbox'
Merge branch 'master' of https://github.com/lowell/TimeLapse
komentarz zbedny
Minor changes to friend.php
added action for deleting performance
changed php-cgi for php-fpm on openshift
simplified
removed comments
Merge pull request #28 from lukaszgi/feature/simplify_forms

Feature simplify forms
cleaned model
Bugfix: Assign pool protocol even if longpoll already known
Simple BIP22 long polling, not quite ready for use yet
Reconnect longpoll if longpollid changes
Advertise BIP 22 long polling capability
Add --no-gbt option so getblocktemplate can be disabled if it causes problems
The moment we receive any real data on a long poll link, it ceases to be idle
Honour block template expiry (BIP 23 Basic Pool Extensions "expires")
Try to pass CC and CFLAGS to libblkmaker build system
Update to use automake for libblkmaker
Remove copy of old jansson from source repository
Merge branch 'rm_jansson_embed' into gbt
Fix Windows build
Add error checking in GBT implementation
Bugfix: Disable long poll hanging detection, since it has way too many false positives

Pools will just need to get long polling right :P
Bugfix: Pull out GBT request collapsing since it is no longer needed with new get_work main loop
Merge commit 'cdde52d' into bfgminer

Conflicts:
	miner.c
Add FriendlyName
Update View/Elements/admin/header.ctp

Added new cake like controller action for dashboard and website link
Camera was commented out.
update daoEvent trigger
add some alase
add tmux config
add vrome config
fix
Fixed build errors on experimental code
Later cabal updates.
chalice_in functional
Add ability to extract next location out of redirects
Actually follow redirects. Now I need to install SSL support
base.sql
Revert "ignoring generated api doc"

Of some bizaar reason the commit right before was reverted.

This reverts commit a12dafcfacccfda9866425ca3874e49fa9319fc5.
Allow local zshenv customizations
[maven-release-plugin] prepare release puppet-config-0.16
sql generator and new property in config file
Added Mega Shield reference and various components
Recovery module: reorder code and prepare for a split into multiple files.

No code changes.
Split log_io.m into log_io.m and recovery.m

No actual code changes, simply split a big file in two.
Merge branch 'perl-makeup'
added interactive color to gitconfig
vim: added rsync cache to wildignore
updated scoremod with scoreline diff and color
added spec stays spec plugin to all configs
Add multi kindle user functionality
added Euro to Euro exchange rate, to avoid KeyError when converting from or to Euro.
AtualizacaoFuncionalidades
Fix layer.refresh callback
Push to v0.6.6
remove unused parameter
remove unused code
move wildcard_file handling out of the Adapter class
refactor: use a ColorspaceAdapter class
move writing to rest file into a function
add an --info-file option
simplify
introduce ColorspaceSequence and Colorspace...Reader classes (tests fail)
5' adapter trimming in colorspace works without primer trimming
make --too-short-output work correctly both with and without --trim-primer
restore old behavior: check read length after primer removal
increment version
Ajustes pedido de compra de material
Redirect old URL for Clark's tutorial, part 2.
Merge branch 'master' of github.com:marklogic/RunDMC
aggiunta gestione combo segreta
Initial whirr integration draft.
remove test code
update schema
Remove blacklight for now
完善deploy与version页面
Merge pull request #105 from liuliliujian/master

修复deploy与version页面的问题
resolve merge conflict
git test repo private key
When copying issues, let the status be changed to default or left unchanged.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9404 e93f8b46-1217-0410-a6f0-8f06a7374b81
test
Merge branch 'master' of https://github.com/masudiiuc/rndbox

Conflicts:
	src/RndBox/Bundle/AuthBundle/Resources/config/routing.yml
save  Idea is done with view
New file added for Idea Module
Added .gitignore
Imported Upstream version 0.4.4.20121222
Imported Upstream version 0.4.4.20121226+dfsg
Merge tag 'upstream/0.4.4.20121226+dfsg'
Merge tag 'upstream-minetest-game/0.4.4.20121222'
Update upstream changelogs.
Make this debian/0.4.4.20121226+dfsg-0.1
Tweak live_auction tmux config.
Remove FA mail account.
Move Transifex and SVN data from meta file to DB
Local settings distribution copies
changed deploy script
changed deploy script
fix server.rb
add しなちく
add fatty command to find space eater