labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
fixes for grid drawing.
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
fix for grid drawing.
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Grid drawing fixes.
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js
Grid drawing fixes
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Fixing IKNINJA-1634

Adding a fix for referencing the stop from all elements on the gradient stop itself.
Merge branch 'refs/heads/Ninja-Master' into Color
Grid drawing changes
Tweak to an edge case in grid drawing.
re-wrote the radial blur shader.  Changed tolerances in the deformation shaders.
Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixes

Conflicts:
	assets/shaders/radialBlur.frag.glsl
Merge branch 'refs/heads/Ninja-Master' into Color
Merge pull request #389 from ericmueller/GridFixes

Grid fixes
Merge branch 'master' of github.com:Motorola-Mobility/ninja into Lights
Update Readme.md to fix some typos
Added rotation file logging
build aosp build repo
Merge branch 'types'
Fixed typo
Somehow the .classpath got fouled up and lost the resources directories.
Merge branch 'stable'
Promote master to 8.0.1-SNAPSHOT
Prompt for a userId when saving if the userId is "default"
No code changes.  Deploy a shaded jar too.
Send them to builds sorted by last modified, descending.
Start adding eviline to zerom
Eviline mostly working.
Fix rule select dialogs.
Merge branch 'master' into feature/eviline
Merge branch 'feature/eviline'
Use eviline 1.0.13, the stable release, not 1.0.14-SNAPSHOT.
Fix eviline web play
Enable NET-EVILINE-VS-BATTLE mode
Added top bar to site.
Website updates
Put the user creation dialog in a loop, which you can get out of by
either saying NO to user creation or entering a user name.
Adjusted NET-EVILINE-VS-MODE to follow caffeine's suggestion in issue
ZERO-2: harder randomizer and 1:1 lines-cleared to lines-sent ratio.
Startup improvements
Close the NetLobbyInternalFrame when the NetLobbyFrame is exited.
Fix ZERO-3
Alpha 5 checkpoint: Massive, non-functional, refactoring of front-end to use requirejs, modules, redesign submodels and references, switch to cheshire library, bug fixes, etc.
Cleaned up some code artifacts
Let admins know about server attacks - refs #83 
some clean up
misc: save CMake-generated headers into a separate directory
first stage of botlib code removal, refs #3
Merge branch 'botlib-removal'
2ème Modification de l'inscription suite à un BUG
Minor formatting and font changes to the RubyTree site.
hanging else
support twitter oauth via out-of-band
Ignoring compiled MEX binaries for all platforms

Including mexglx, mexa64, mexmaci64, mexw32 & mex64 (see
http://sfwn.in/FxbE for official list from Mathworks).
Ignore .idea/ folder for AppCode users.
Added .AppleDouble to OSX
Added Appcelerator Titanium .gitignore file.
Merge pull request #420 from vanniksoftware/master

Appcelerator Titanium .gitignore file
Merge pull request #419 from jonhkr/patch-1

Added .AppleDouble to OSX
Merge pull request #303 from safwanc/matlab-mex

Ignoring compiled MEX binaries for all platforms
Manual merge to close #305
Merge remote-tracking branch 'stig/patch-1'

Conflicts:
	Objective-C.gitignore
Seems like this should go into OSX.gitignore instead.
Merge branch 'master' of https://github.com/github/gitignore

Conflicts:
	Global/OSX.gitignore
Fixed note type
renamed event type
Remove getLink() from ArcanistLinterTestCase

Summary:
Installations extend this.

Another solution would be to extend `ArcanistLinterTestCase` from `ArcanistArcanistLinterTestCase` and return null in `getLink()` to avoid code duplication but I prefer clean class hierarchy.

Test Plan:
  $ arc unit

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3878
Toolbar in ImagePage is now semi-transparent + small changes
"TTY completed, next task: IPC"
finish check google signin
finish sigh out handler
finish check current user
added django js integration source code
Merge branch 'master' of github.com:fdumpling/gittest
Get Country from IP address

requires ip2nation database
BUG: switch to using std string for the slice UIDs, updating testing
FIXUP: Minoriko implementation

* restore modified settings
* ui_meta bug fix
Reimu: Tribute can only deliver hand cards now.
ScarletRhapsodySword bug fixes

* Rewrite, the force hit effect is now included
  in the Attack action, thus Remilia can have VampireKiss
  triggered.

* Now you can't fire its effect by dropping itself.
inc ver, welcome msg
bugfix: corrected fft size. inserted zeros for ununsed channels. created dummy drm_receiver.m
Adding powerpoint which is the basis for the chart
updated query
Merge branch 'master' of github.com:fightangel/eureka
Documented recipe
Installing and disabling mixin works
Submenus added for all custom menu items + fixed bg preview in 1124 for submenus
Fixed navigation in home furniture customizer
more glow
Merge remote-tracking branch 'origin/master'
radio --> togglebutton, bugfixing
moved bg glow overlay
add custom_overlay
Merge remote-tracking branch 'origin/master'
missed that one
Some Glow mode fixes
Merge remote-tracking branch 'origin/master'
bg overlay fix
Merge remote-tracking branch 'origin/master'
forgot a panel
Merge remote-tracking branch 'origin/master'
Move coloring of timepanel to colordialogs
More versatile glow + color mode (added 'light' version of glow mode)
Keep two images of widget thumb preview (because of 4:3 thumbs covering show info)
Forgot to commit language change
Fix fanart previews in 1124.
bundler added, time fixed
checkin
Merge branch 'master' of https://github.com/fireblade99/youtv
Updated default routes
* Amended code to allow us to change top and bottom shooter speeds on the fly
Consolidated dependencies (and made them into submodules), Removed core data bits
Changes by RL
Fix typo for wiki page access
adjusting some things
creation message fin
message de fin termine
bug renderpass
composer ok
message ok + visuel ok + chaipu
update posts function
actualizeTerminals and actualizeNonTerminals methods added and tested
Silly commit just to show how git works.
Added #bash rc files, directories created.
Signed-off-by: Felipe Pupo <fpupor@gmail.com>
startup knowledgecenter
Add commands of power management, alias setting and terms (not implemented)
TODO: Implement there commands
add tmux config and update colors
add advertising source to customer accounting summary, RT#18349
end browser
fixed spacing
change index values to match indexden
Merge branch 'master' of github.com:friendlycode/wmgg
Added open source all the things!
Restored the next_level link of rocky-roots to the caverns-of-holes level
Made the funnel machine cause things falling in to slide down, and grouped the conveyor belts in the kitty factory so that they're present underneath the kitty-machines that drop kitties onto them.
Restored an overwritten change.
Depend on Makefile format, rather than the current layout
Merge branch 'master' of github.com:frogatto/frogatto
Wired in some not-yet-completely-drawn factory props.
modify SampleFields#getChanges() if ! and add test
Revert "modify SampleFields#getChanges() if ! and add test"

This reverts commit 58bcde0de4281445117b3479550d7e3623157c94.
Merge remote-tracking branch 'origin/master'
retry modify SampleFields#getChanges() if ! and add test
pull up AbstractFields#getField() <- SampleFields
test SampleFields#getChanges()
pull up AbstractInputFields#getChangeFields() <- SampleFields
rename SampleFields#getChanges() -> getChangeLogs()
make helper public
rebuild console csproj to be .net 4ish
parameterizing test command
move login info to another class
3d transform matrix parsing incorrect way round
Merge pull request #7 from matthew-andrews/master

Fix matrix3d parsing to update scroll position on scroll interruption; fixes IE 9 / IE 10 positioning error when interrupting a scroll
defaulting to PAP
Merge branch 'master' of https://github.com/fup/puppet-xl2tpd
Added property file for configuring Poortjes.
rename MemoryStorage to TransientMemoryStorage
created val contextEntities in ActivateContext
entity validation onCreate bugfix
user/password on MongoStorageFactory
new constructors for PrevaylerStorage
new regexp tests
Removing projet.pdf
fixed models and stuff
dodanie zmian autorskichw
gallery v0
new controller along with update parser. The datebase is still running and will upload later
Signed-off-by: unknown <WB@PC-201010101123.(none)>
removed debugging

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@18370 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Fixed some warnings

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@16453 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
probability calculator wrong for discrete (interval & right-sided)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@19441 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
4.9.38.0

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@19442 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Description update


git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17386 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Add manifest_version (required)


git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17389 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Automatic update of propset svn:ignore via for svnignore.txt's by svnignore

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17390 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Fix #2691 part 3 (change code similar to r20737)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@20739 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Login to google and undo - redo looks nicer, not perfect however

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17621 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
* Tiny updates, enhancements
* Change fix value polynomials to substitutions in Singular

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17622 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
WMS 1.3.0 Axis order GetCapabilities fix for GEOT-375
Merge pull request #37 from jive/wms130

WMS 1.3.0 Axis order GetCapabilities fix for GEOT-375
Start with a blank set of global gems
Merge branch 'blank_global_gems'
adjusted fullscreen for macVim and little changes in .zshrc
Implemented better error handling in the rest layer.
Merge remote-tracking branch 'origin/master'
Implemented an abstract approach to tabs that uses an Action Bar on
devices over SDK 11 and a TabHost on devices below that.

Allowed for the simplification of the tab layout as an added bonus.
Updated android sdk version and included annotations dependency
upped versionCode to 25
tidied imports
Merge branch 'abstract-tabs' into develop
Merge branch 'develop'
Should append to .profile rather than overwriting it as it might have existing contents
Merge pull request #1069 from drt24/patch-1

Should append to .profile rather than overwriting it as it might have ex...
Fix #2058 diff problem of non ascii paths and non utf-8 file encoding
Merge pull request #2100 from hiroponz/fix_non_utf8_file_encoding

Fix #2058 diff problem of non ascii paths and non utf-8 file encoding
Adds a print function to mine.h
deleted stocks4.py
fix superclass mismatch
setup.py, twisted draft
Mass package rename to match standard naming conventions.
Package comments and gofmt.
Alterando as formas de configuração
How did that end up there.
Fixed the docs.
Fixed handling the options object.
Added support for setting the content-type.
Squashed commit of the following:

commit 923a119a994918a641bf2a5aee516757be3d17f4
Author: gplin <gping2000@gmail.com>
Date:   Wed Jun 20 23:29:23 2012 +0800

    Squashed commit of the following:

    commit 3409b798ce3b17005696f47690982267c7678548
    Author: gplin <gping2000@gmail.com>
    Date:   Wed Jun 20 23:22:48 2012 +0800

        d
d
c
d
a
d
Merge pull request #2 from gplin/1.0

1.0
update to lincomatic spec
--raw command line switch working properly now
Updated Readme to include countdown docs.

Part of my http://24pullrequests.com commits.
few words about white spacing has been added
spelling
import
Ссылки и предложения
More links
oh noes dummy typo
fixes from @grayru
fixes from @grayru
fixes from @maslbl4
fixes from @maslbl4
Merge pull request #137 from hostmaster/master

about white spaces
Merge pull request #139 from amogil/master

Ссылки и предложения
remove everythin not connected to drafts
remove old drafts
fixes from everybody
fix a dummy typo but that one a last
Merge commit '4828474d88c7cdc3c058e769d3209d1e8fa36447'

Conflicts:
	source/posts/2012-06-19.md
Use optparse to accept feed url
fix bug: #40, #38, #41
Testing mode added
HIVE-2991 apply the patch integrating Clover support
minor fix to the shebang line
Updated ClaferCompiler to use CompilerResult
image download link
Beer list sync
Switch to new method names.
Fix scrape errors.
Functional sync.

It still falls over on some items, need to identify why.
Fixed failing integration test
Merge pull request #271 from guardian/football

Fixed failing integration test
Added test for Live games
FIX: #72, "Add+Remove layers does NOT work in CACHE_ONLY mode"
Fix rookie mistake to appease Linux :(
Merge branch 'master' of github.com:gwaldron/osgearth
buildSpatialMap added
Marginviewer WIP bug fix off-by-one
Update spec; move welcome action to separate file

Note: `require 'actions/welcome'` doesn't work as expected, using instead
`require_relative`
Update layout and index templates
накопипастил зачатки проекта
сделал приложенеи частично рабочим
Document how to write matchers.
dylan: Fix potential typing problems in functions called by dispatch logic

* sources/dylan/integer.dylan (ash-left): Add explicit specializers to
  assigned variables to prevent potential typing problems during
  assignment conversion.
dfmc-typist: Incorporate types of assignments in assignment conversion

* sources/dfmc/typist/typist-protocol.dylan: Don't defer type
  inference of assigned variables to their generator computations, so
  that types of other assignments can be incorporated.
Rename split's remove-if-empty param to remove-if-empty?.
Make all library and module name titles consistent (by lowercasing them).  Fix a few errors.
More title fixes
Merge pull request #213 from cgay/doc-titles

Make all library and module name titles consistent (by lowercasing them)...
Fix common-{dylan,extensions} confusion.  Document split.
Merge pull request #214 from cgay/doc-titles

Fix common-{dylan,extensions} confusion.  Document split.
Move TODO so it doesn't mask example.
Merge pull request #217 from cgay/doc-titles

Move TODO so it doesn't mask example.
Merge pull request #209 from cgay/split

Rename split's remove-if-empty param to remove-if-empty?.
Output on stderr rather than stdout; fixes #207

Both debug-message and the last-handler now output to
standard error. The debug-message does this in the C
runtime (on UNIX only so far).
Merge pull request #215 from hannesm/output-to-stderr

Output on stderr rather than stdout; fixes #207
copy files in install target + add release target

fixes #159

use the built products from third bootstrap
use these as well for release target
Merge pull request #216 from hannesm/make-install

don't rebuild in install target
Remove the arch flag for dylan-compiler as this is correctly handled by using a different build script.
Merge pull request #218 from waywardmonkeys/remove-arch-flag

Remove the arch flag for dylan-compiler as this is correctly handled by ...
Revert "Use non-signal-preserving versions of setjmp / longjmp."

This reverts commit 6873a60c2454afc4c0217cee8116b41c6be81e81.

This commit broke bootstrapping on a number of compilers
and operating systems. A revised version of this fix will
be forthcoming.
Use non-signal-state-preserving setjmp/longjmp.

This is a correct implementation of a previous commit that actually
bootstraps.
fdmake.pl: Print per-library timing info (seconds).
Remake av add user
remove unused default value.
enable to add /opt partition with --optsize=SIZE option.
Adding expand region; really just adding everything that Magnar Sveen has ever created; see @magnars on github
Fixed; Handle markdown code elements without language name (again).
first commit
Fixed rawcand after breaking it with getopt.
[java] Fixed issue #1053 - Class<> variance is not the same in Java and Haxe


git-svn-id: http://haxe.googlecode.com/svn/trunk@5291 f16182fa-f095-11de-8f43-4547254af6c6
[java] Floats to String now don't have a trailing ".0" when they can be represented by an Integer. Fixed Issue #1076


git-svn-id: http://haxe.googlecode.com/svn/trunk@5292 f16182fa-f095-11de-8f43-4547254af6c6
[java/cs] Fixed issue #1062


git-svn-id: http://haxe.googlecode.com/svn/trunk@5293 f16182fa-f095-11de-8f43-4547254af6c6
sourced the wrong thing
update httpd.conf
Update location of python environment
Use su --session-command, not sudo
Added iptables config
Added boto and django-ses to requirements
Added preliminary comments

Added preliminary comments to DicomImage and GrayscaleRenderOptions
Added WindowWidth and WindowCenter properties to DicomImage class

Need confirmation from rcd/fo-dicom regarding comments before moving
forward
Proper export of SVG to PNG for architecture-overview

Signed-off-by: Steven Dake <sdake@redhat.com>
删除网购tag
ignore swp files
make kvm manifest meet my needs
changing virt_path to virt_disk to match type
presolve
Estruturação do plano de medição
Merge branch 'master' of ssh://git@github.com/hipolito/Tamandua.git
Alteração da estrutura da documentação, apgando as pastas antigas;
Added extra abstraction for DetailPane to make it possible to switch
content independent of MediaNode
Fix compile issue on Linux
Finished editors

Screen Chunk Editor done.
Allow setting for FeaturedImageZoomer module.
Adding a simple read me
fix of hashes
Added ColumnDescriptor
ofp-errors: Remove OFPERR_NXBIC_DUP_TYPE

OFPERR_NXBIC_DUP_TYPE is currently only used in
decode_openflow11_instructions() which is part of a non-NX extension
portion of the Open Flow 1.1+ implementation.

After recent discussion it has been decided to attempt to
only use standardised, albeit lest-specify, errors unless errors arise from use
of an NX extension.

With the above in mind it seems appropriate to:
* Use OFPERR_OFPIT_BAD_INSTRUCTION in place of OFPERR_NXBIC_DUP_TYPE.
* Remove OFPERR_NXBIC_DUP_TYPE as it is no longer used.

An unfortunate side-effect of this change is that the error for
the case in question is now less-specific.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofp-errors: Remove OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED

OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED is currently only used in paths which
are part of a non-NX extension portions of the Open Flow 1.1+
implementation.

After recent discussion it has been decided to attempt to only use
standardised, albeit lest-specify, errors unless errors arise from use of
an NX extension.

With the above in mind it seems appropriate to:
* Use OFPERR_OFPFMFC_UNKNOWN in place of OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED.
* Remove OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED as it is no longer used.

An unfortunate side-effect of this change is that the error for
the case in question is now less-specific.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofp-errors: Use OFPERR_OFPBRC_BAD_PORT

* In the case of OpenFlow 1.2+ OFPERR_OFPBRC_BAD_PORT is defined
  in the specification and seems to be the most appropriate error
  to use when an invalid port is encountered in a Packet Out request.

* In the case of OpenFlow 1.0 and 1.1 no appropriate error message
  seems to exist. Perhaps because an invalid port is not possible?
  I'm unsure.

  In any case, make use of a non-standard error code (1,514).
  This was formerly known as OFPERR_NXBRC_BAD_IN_PORT but
  has been rolled into OFPERR_NXBRC_BAD_IN_PORT to allow the
  latter to be used without concern for the prevailing Open Flow version.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofp-errors: Use OFPERR_OFPBRC_BAD_TABLE_ID

* In the case of OpenFlow 1.1+ OFPERR_OFPBRC_BAD_TABLE_ID is defined
  in the specification and seems to be the most appropriate error
  to use when an unknown table id is encountered.

* In the case of OpenFlow 1.0 no appropriate error message
  seems to exist. Perhaps because an invalid port is not possible?
  I'm unsure.

  In any case, make use of a non-standard error code (1,512).
  This was formerly known as OFPERR_NXBRC_BAD_TABLE_ID but
  has been rolled into OFPERR_OFPBRC_BAD_TABLE_ID to allow the
  latter to be used without concern for the prevailing Open Flow version.

Signed-off-by: Simon Horman <horms@verge.net.au>
ofp-errors: Use standardised code for OFPERR_OFPBMC_BAD_VALUE

Use standardised code for Open Flow 1.1 OFPERR_OFPBMC_BAD_VALUE

OFPERR_OFPBMC_BAD_VALUE is defined in Open Flow 1.1 as (4,7),
so use that code instead of a non-standard one.

Signed-off-by: Simon Horman <horms@verge.net.au>
add an easy way for board administrators to disable some extra javascript features
Tag AJAX editing completed.
(#3060)  Generate SSH keypair names that OpenStack will like.
Don't add duplicate edges to the graph
Remove bytes that can't be converted to the correct encoding
Merge branch 'search' into local
Merge branch 'CsvDoctor_fix' into local
Merge branch 'search' into bycoffe
Merge branch 'f2_fix' into bycoffe
Merge branch 'search' into bycoffe
Fix conflict
Allow parameters to be passed to Search#filing
Merge branch 'search' of github.com:huffpostdata/Fech into search
make hm_debug() return same data
fixed notice
fixed crton test
Reorder wrapper tests so fast tests go first
bug fix for rake tags task.
child_create() now properly execs login.  Added kill.rb to kill hung riftty process.
同姓同名でsignupできない問題を解決
First instance of using function to control location
weitere modifaktionen an den cups - Ship
compile less>css
Merge branch 'master' of github.com:ibigbug/ZQ-Planet
Edited NIRSPEC and NIRSPAO data directories
Fixed more dataDirs
Moved log generation from schedule functionality into getSchedules.py
dry up machine configs, autosave bookmarks
Bug fix - example.sh should use the installed copy of ncsplash
using existing data added
fix the "all" target
update readme
some htaccess variant add
Merge branch 'master' of github.com:imagecms/ImageCMS
Facilipy: empty django app

Created via django-admin.py startproject facilipy
Loads of new stuff
Making completion key bindings less intrusive
Save and restore terminal buffers
Map variable printing to cerr and squirt log to different key bindings
Adding git test directory into list of ibuffer groups
Don't update the author in c files when saving because you'll overwrite people's names
Solarized theme
Use /u/iim instead of ~ so other people can use this
Fixing python indentation
Use color theme in fast mode
Adding c++ namespace snippet
Clear now something else
.
Update README
04-11-2012
Merge branch 'master' of github.com:imoutits/anime-db
04-12-12
'04-12-12'
04-12-12
04-12-12
04-12-12
04-12-12
04-12-12
04-14-12
04-14-12
04-14-12
04-15-12
04-15-12
04-16-12
04-17-12
04-18-12
04-18-12
added the matt bot
Creating russian localization - localized app/popup.js, css/application.css and manifest.json
Rotated tank turret approx 90deg.
- added new test cases
- added some javadoc comments
Basic model added
Merge branch 'master' of https://github.com/insolite/DBO_Labs
m_filter Don't move the filter to the beginning of the vector when a match occurs
preserve history for cob_controller_config_gazebot
Merge branch 'master' of /home/aub/sandbox/gittest/cob_simulation
renamed icob to raw and merged and cleaned up lots of things
new calibration
using calibration for laser scanners
Merge branch 'master' of github.com:ipa-fmw/cob_robots
new calibration
Merge branch 'master' of github.com:ipa-fmw/cob_robots
Merge pull request #2 from abubeck/master

changes icob -> raw
fix for raw
add calibration for base lasers
release 0.4.2
renamed *rviz files to *remote
Merge remote-tracking branch 'beisheng/master'
Merge remote-tracking branch 'renxi/master'
aaa
Merge remote-tracking branch 'ze/master'
update srs_likelihood_calculation
Merge branch 'master' of https://github.com/beds-tao/srs_public
Merge pull request #57 from beds-tao/master

update likelihood_calcularion and jsaon feedback from decision making
updating contenttypes fixture
changing user url + fixing main to user komoo_user
Update rest-api
Merge pull request #3 from benschrauwen/patch-1

Patch 1
Fixes.
Moved MollomBase class to the module __init__.py

- Cleaned API/Site.py to return SiteReponse instances rather than
  raw content
- Did not fix the list API call.
change to file_path
Change paths to logger.sb_log_instance.log_file_path
Logic.And and Logic.Or didn't actually evaluate conditions.
Fixing count_correct bug,
counting time in days.

Adding flashcards for jump assembly commands.
Add constant "Undefined" to zpu_configs.
Merge pull request #4 from ivanjh/pullreq

Accepted: "Add constant "Undefined" to zpu_configs.".
Hook times which is needed by the perl test suite.
Hook ualarm.
License timescaler under the GPLv2 or above.
Hook setitimer.

getitimer is not hooked for the moment.
This can result in strange behaviors as this is not symetrical.
Cosmetics (use the same coding style everywhere).
Hook getitimer.

This finish the hook of (set|get)itimer.
The Perl test suite i now fully passing while the coreutils only fail on one
test.
Added CSS Parser
Added JS, CSS, Raw File, and Static Files
Added new element ThemeSettings to all Screens.

Use this new method for short strings in ScreenScore.
Remove all old stuff related to code generation (issue #75)
initial experimentation with c++ web application server
Merge branch 'master' of github.com:jagguli/cppwebapp
AS7-5587 Upgrade to Mojarra 2.1.13
fix cluster-connection.connector-ref description
Fix wrong unmarshalling order of process inventory data.
AS7-5624 Disable intermittently failing test
GenericSubsystemDescribeHandler to OperationDefinition
Domain root resource definition
Convert profile to resource
Operation defs for domain server lifecycle ops
Initialize everything converted from DomainRootDescription, only leave unconverted stuff in DomainModelUtil
Fix attribute defaults in read-resource when the model is not defined
AS7-1459 Add debug flag in the --help output and make the standalone scripts more robust.

The -d / --debug flag can be at any place in the list of arguments and verify that the next argument is not a flag.
eg :
./standalone.sh -c=standalone-ha.xml -d -b 0.0.0.0 # debug on port 8787
./standalone.bat -b 0.0.0.0 --debug 9797 # debug on port 9797
[AS7-1459] Remove the -d debug option. Fix a few Windows issues.

[AS7-5560] Properties can't be parsed properly via a Windows command prompt. Send all commands over and allow the server start class to parse them.
[AS7-5598] relax cluster-connection constraints

AS7-5107 added a constraint to the cluster-connection to have
either a static-connectors or a discovery-group-ref defined.

However there is 1 case where it is valid to define a cluster-connection
without static-connectors or discovery-group-ref: when it is part of a
cluster and it accepts connections from other nodes but does not connect
to any other node.
This is a edge case but a valid one.

This commits relaxes the constraints and accepts a cluster-connection
without one of these attributes
[AS7-5585] Sanitize the output when writing the logging.properties file.
compare attribute or operation attr alternatives
added outter readme and todo files
edit original readme and todo, but still not finished
Use feature detection rather than browser detection
Add SECRET_KEY to prevent deprecation warnings in Django 1.4
Fix several files
Add test case in model and controller
Adds a verbose option to chat
NodeLib: fix for major problems caused because the empty address was actually created as a symbol instead of as an address
Merge branch 'master' of github.com:jamoma/JamomaCore
adding comment for prev. commit
Cleaning up implementation test for jmod.net externals
Merge branch 'master' into tl-spatlib
upravy33
Merge pull request #58 from stranma5/master

Malé úpravy 33
Missing commit, do not use for-each
LINECYC Update code
Added a throwaway script to convert present BOM to sensible BOM with separately maintained digikey parts list.
Fixed for TelduinoV6
Added parsing for both Telduino and Meter
Almost fixed DB bom
Added Shield bom
Added Telduino Bom
Final set of BOMs
Added check isRoaming
Update to jemalloc 2.2.5
last executed command in CLIENT LIST output.
minor refactoring to networking.c adding a separated function to get a string representing the current state of all the connected clients.
better bug report info on crash
clean REDIS_DIRTY_CAS when discard Command runs. otherwise the next MULTI/EXEC may fail in the same RedisClient 
Merge pull request #209 from woowenjie/unstable

clean REDIS_DIRTY_CAS when discard Command runs. otherwise the next MULT...
Added regression tests for issue #209
log client protocol errors for log level >= verbose
Merge pull request #208 from jbergstroem/jemalloc-2.2.5

Update to jemalloc 2.2.5
jemalloc gitignore updated to jemalloc 2.2.5
still problems with the AOF race regression test, disabling it again for now
two new AOF related INFO fields that can be interesting information for debugging.
show initial querybuf bytes on querybuf overflow.
--quiet option implemented in the Redis test. Output improved a bit.
default log level is now notice.
Replication bug fixed: now non blocking connect is also forced to follow the configured replication timeout.
I like when main() is the last function in the file.
-h is now alias for --help when running redis-server.
Support for command line configuration options for redis-server.
Even when loglevel is warning the server should log that it started.
slight work done. getting backbone framework sorted out
backup template.school2.xml
Updated vimrc and zshrc. Vimbundles now pulls jcarley vim-colorschemes.
Fix typo in home page h1
switched to a version of barium.js that doesnt use JSON stringify so it will work on more browsers.
Fuel 1.4
Major commit
Changed RequestFormatter to be determined by incoming Request Data Mimetype not specified request
Added new RestClient Library for making Requests
Added support for Serialization/Deserialization to Image formats
Added support for Serialization/Deserialization to XmlDocument for Xml Request/Responses
Support for DeSerialization to Type or XmlDocument for XML responses in RestClient
Support for DeSerialization to Type or string for JSON responses in RestClient
ENH: remove PyPI URL from default
REL: add release date
REL: master now 4.5.1
Merge branch 'master' into merge-master-to-epd8
quite el disclaimer.
Merge pull request #158 from joelmoss/snippet_identity_count

Snippet identity name is now set correctly even when a snippet with same identity exists.
Show about text
Replaced (with toggling) JRuby and Java implementations of diff-lcs.
Looks like the JRuby implementation takes 10x as long.
Integrated with both RIEL 1.1.12 and 1.1.14. Added TimeStamp module.
Created a function to calculate the total of a cart
Added total to checkout
Added total to order.
Made both new and edit order resemble each other and have the title checkout.
Merge branch 'master' of github.com:jgarciach/komerko
Created /checkout route to render new order.
New pretty git l thanks to DAS and Gary Bernhardt

More info:
https://www.destroyallsoftware.com/screencasts/catalog/pretty-git-logs
Immediately regretted not putting in `git r`
Add submodule 'tabular'
Update submodule 'emacs-color-theme-solarized'
Add yeganash, a wrapper around dmenu
Add sparklines (via spark) for wifi quality
Set titles and status lines for tmux
Use SSH varaibles consistently
Add Vim Puppet bundle
Update Emacs to dark theme
Ignore Emacs ELPA downloads
Make TASK argument optional, and add in the synchronous flag.
Move logging into its own module for easier use throughout other modules.
Move sake to its own file -- index.js just returns returns that.

Merge sake and vm into one. Easier to keep track of responsibilities.

Add '-r, --require MODULE' option for module loading, and exposing.
Merge branch 'working'
Add options '-S, --synchronous' to allow altering the behaviour of how tasks are defined.
Merge branch 'working'
implement sqlalchemy dbengine backend

implements bug #1021767

To sync db migration, for now use temporary
script bin/ceilometer-dbsync.  Modify it to point
to your db url e.g. 'sqlite:///ceilometer.db' or
'mysql://user:mypass@localhost/ceilometer'.  Also
ensure the database_connection= in ceilometer
conf files point to same db url.

Change-Id: I1c72b0a6b860738e94cf19666cb47db88ac9b251
Made the async templates work.
before signup
method to stop any auto slideshow altogether
clarified comments  a little
added resume method
updated minified version
Merge pull request #19 from gerrit/stop

Stop
fixed minified version
Let slide(index) default to preset speed

I would expect the slide method to use the default speed if none was
passed to the function. Added that functionality.
Made swipe.min.js reflect changes in swipe.js
Support 1:1 mode in Gecko browsers
Merge pull request #63 from mbrubeck/master

Support 1:1 mode in Gecko browsers
Merge pull request #57 from solidfox/master

Made slide(index, duration) default to this.speed
Merge branch 'swipe2' of https://github.com/jimmynotjim/Swipe into swipe2

Conflicts:
	swipe.js
	swipe.min.js
Added option for gutters
Fix frame for fanart icon in DialogAlbumInfo.
Make auto-scroll speed for textboxes configurable.

Addresses Issue #175.
ex5

add ex5, also remove the data file from former execrise.
Add mailto link to contact me link in nav fixes #4
Revert "remove AFNetworking"

This reverts commit 2ca89aea7c52a4e8110ee5984d95c9cdc4224de7.
Revert "ignore AfNetworking and JSONKit"

This reverts commit 24ce7a2e6e1af339c13a34b4252ecabd8d2db1ef.
first page flip code
Fixed the wording slightly.
keys are laying out, other refactoring is only half-done
fixed the rest of the refactoring; TODO: vertical and horizontal finger motions at the same time
fix warnings
rename Button{Set,Panel}

preparing to move all the fat-finger stuff into here
fix up/down dragging motions
Use 11 point font on linux.
Added pagination via kaminari to all list actions and associated views.  Fixes #19
fixed schema cause someone edited an old migration
Manually merge remote-tracking branch 'curtis/pagination'

Conflicts:
	test/functional/requests_controller_test.rb

Migrated deprecated TestUnit tests to RSpec.
Added two missing settings to db.
Removed local db settings.
Fixed display issue in users when auth.use_own_names was on.
Made installer check relative so that it would not break for subdirectories.
Installer - removing intro message from success view
fixes #265 Updating paths to the main Bonfire app to make sure the configs are written
fixes #262 removes explicit reference to bf_ prefix
Fixed display of roles during user editing when role name is lowercase.
Merge branch 'develop' of github.com:ci-bonfire/Bonfire into develop
More fixes for permissions checking, this time in the auth lib itself.
fixing issue with checking for the install app
fixes #266 changing the Migrations lib and Module Builder to use the correct DB field name
Remove the migration schema record if the version drops to 0
Installer: removing the requirement to have the database config writable in the installer
Adding a version number
Adding the ability to create a module from an existing DB table
Improving the views created
fixes #276 making the db field name lower case
fixes #261 Allowing for spaces and dashes in the Module Name
Improving the form when selecting the number of fields
kernel: bcma: update to version from wireless-testing tag master-2012-07-11


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32670 3c298f89-4303-0410-b956-a3cf2f4a3e73
mac80211: update brcmsmac patches


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32671 3c298f89-4303-0410-b956-a3cf2f4a3e73
[package] netifd: repair dhcp client id option
Busybox udhcpc dropped support for the -c option, instead it can be emulated by using -x 0x3d:id,
change the dhcp protocol script accordingly and filter all colons from the id while we're at it.
This change supersedes http://patchwork.openwrt.org/patch/1810/

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32573 3c298f89-4303-0410-b956-a3cf2f4a3e73
osm migration
serialization&minor fixes
falta umas ;s
Added support for other S3 compatible APIs like Walrus and Cumulus
Link add improvement
Updated/added license
Updated models files
removing txt readme
add progress bar in sub convert
removed syntastic
Merge branch 'master' of https://github.com/johndgiese/dotvim
Merge branch 'master' of https://github.com/johndgiese/dotvim
Adding JSMin support
Update README
Fixed the build issue.

The problem was with using a custom type to index an associative array. It
is necessary to add the functions opCmp and toHash to the type. Could not
get that to work for some reason. So I backed out to use a simple array.

A wrapper could be used to index this array without using Piece.toHash.
Still, in the end, this whole design seems too complex. So I am holding
off on further adjustments until I get a clearer picture of the whole
thing.
Project: generate random token if none is provided
lots of changes; added replace
Add launcher source and resources
Initial changes to get the py launcher building
Support 32-bit release building:
Get 64-bit building
Add the pyw launcher
Add pywlauncher project
Add associator
Add version resource.
Use GetEnvironmentVariableW instead of _wgetenv to silence VC warnings.
Package the launcher.
Fix off-by-one error.
Fix UNICODE glitch.
Build and bundle the 32-bit launcher in all configurations.
Remove the original license, as this was contributed under Vinay Sajip's agreement.
Remove associator project - it's not needed
branch merge
Merge /features/pep397 changes
Make lzma.{encode,decode}_filter_properties private.

These functions were originally added to support LZMA compression in the zipfile
module, and are not of interest for the majority of users.

They can be made public in 3.4 if there is user interest, but in the meanwhile,
I've opted to present a smaller, simpler API for the module's initial release.
Tidy up comments from dd4f7d5c51c7 (zlib compression dictionary support).
Document the rest of zlib.compressobj()'s arguments.

Original patch by Jim Jewett; see issue 14684.
entrega da v1 para correcao
entrega da v1 para correcao
removed migrationerrors
New tests, wohoo-
Объединение пользователй и прав доступа в единую область
Merge conflicts on README
Las imágenes se muestran en las activities de categorías, productos y
detalle del producto.
Initial commit
Console-mania, that really needs to be gemified
Foundation mania
(#15560) Delete user's profile after deleting account

Previously, if Puppet deleted a user account and `managehome` was true,
then Puppet would leave behind the user profile on disk, e.g.
C:\Users\%USERNAME%.

In keeping with the semantics of the `manage_homedir` feature, this commit
modifies the Windows ADSI user provider to delete the user profile when
`managehome` is true.

On systems before Vista SP1, the Win32_UserProfile class does not exist.
Worse, there is no reliable and built-in way to delete user profiles.
There is the widely used delprof.exe utility included in the 2003 Resource
Kit, but it's not part of the core OS and it doesn't work in later
versions of Windows.

As a result, the Windows ADSI provider will make a best effort to delete
the user profile, and that should work on Vista SP1 and later systems. On
earlier systems, we will warn that it's not supported.
(#13489) Synchronously start and stop services

Previously, we were using the `win32-service` gem to start and stop
services. It used Win32 APIs to programmatically send start and stop
requests. The actual service starts/stops asynchronously with respect to
the request. As a result, when refreshing a service, puppet would issue a
stop request, immediately followed by a start request, and that would race
as the service would often still be running, but not yet stopping when the
start request occurred, leading to ' An instance of the service is already
running' errors.

This commit changes the windows service provider to use `sc.exe` to start
and stop services. Like the `StartService` API, the sc.exe command returns
when the ServiceMain thread for the service has been created successfully,
but before the service enters the running state. The only difference is
that it's easier to map provider commands to executables, e.g. `sc(:start,
name)` and the command returns the last error code (whereas the API
raises an exception with the localized message).

This commit also adds polling to ensure the service is started/stopped
when the start/stop methods return. It uses a timeout to ensure we don't
wait indefinitely.

As far as I can tell, sc.exe is available in 2003 (non-R2) and all future
versions. Previous to 2003, it was part of the NT Resource Kit.

The utility could also be used to configure the service, though that is
outside the scope of this ticket.

I also looked into using `net start <name>`, which does wait until the
service has started before returning, however, it does not return the
correct error codes, e.g. it returns 2 when trying to start a service that
is already running, instead of 1056.
update the pdf file
#4: added github URL
Fixed #4242 (segmentation fault of cppcheck (invalid code: '<'))
AssignIf: Better handling of complex conditions with multiple subconditions
Disable checkComparisonOfFuncReturningBool check because of false warnings. Ticket #2617
favicon.ico: use a 16x16 one
cosmetics
.htaccess: add expires headers
.htaccess: add ETag removal, improve gzip compression
htdocs: remove trailing spaces
htdocs: add a simple script to minify css and js files
switch to protocol-relative URL for fonts
switch to the minified simplepie
Disabled checkComparisonOfBoolWithBool since there are false positives. Ticket #2617
AssignIf: Check into scopes recursively
df
assign-if: Fixed token match
assignif: Fixed testcase. parse while loops if variable is local and not external.
Fixed scope handling problems with CheckOther::checkComparisonOfFuncReturningBool(), removed its experimental status.
Replaced unsafe local isFunction() function by symboldatabase.
Fixed cppcheck message in checkclass.cpp
update minify scripts
Cleanup, tweaks.
version of .perlcriticrc as recommended by AUBERTG
ECMS-1 - Completely refactored News Model and controllers referring to News model's methods
ECMS-6 - Completely Refactored NewMapper class
ECMS-16 - Adding Unit Tests for the News Model
Merge remote-tracking branch 'origin/master'
change accel for jetpack
sesame native store first working connection
a simple test query
Update APP_VERSION to individual formula names
add more behavior type options
#POULPE-350 tests check % added to UserHibernateDaoTest, in TestFixtures method user() overloaded with user(name, email)
Workaround for android's new file scanning behaviour when using the device as a USB drive.
use minified version of dollardom in the examples, as the debug versions are broken right now
updated docs & changelog
somemoretesting
Changed control element queries to use this.element.find (or equivalent)
added class 13
FSAL_LUSTRE : now has correct implementation of fsal_quota.c (to be use for RQUOTA) based on llapi_quotactl
Backport new_handle to 9P.
9P: new_handle logic was badly implemented. This is now fixed
9P: backport cir logic to 9P implementation
9P: fix TSTATFS bug
FSAL_VFS: linkat2 does not use procfs anymore
FSAL_VFS: no more linkat2 (yes, that's a huuuuuuge commit :-) ).
9P: truncate bug fixed
9P: attr was removed from pfid, using fsal attributes stired in pentry instead
9P: OK with cthon's basic and general test
9P: skeletons added for TLOCK and TGETLOCK
9P: add a "not supported in 9P2000.L" error function
9P: TLOCK is using state_lock
9P: Add SAL support for 9P locks
9P: fix locktype bug in 9p_owner.c
9P: minor changes found by using --enable-strict-compile
FSAL Lustre with shook: re-check file status after shook_server_call

Signed-off-by: Philippe DENIEL <philippe.deniel@cea.fr>
FSAL_VFS: linkat2 does not use procfs anymore
FSAL_VFS: no more linkat2 (yes, that's a huuuuuuge commit :-) ).
9P: truncate bug fixed
Merge branch 'tp/81023015' into ibm_next_pt_tmp
Merge branch 'tp/81023074' into ibm_next_pt_tmp
Merge branch 'tp/QC19987' into ibm_next_pt_tmp
Merge branch 'tp/multiple_fixes' into ibm_next_pt_tmp
Merge branch 'tp/ibm_next_pt_init_script' into ibm_next_pt_tmp
Merge branch 'tp/polling_timeout_fix' into ibm_next_pt_tmp
Merge branch 'tp/ibm_next_pt_16' into ibm_next_pt_tmp
Added the recursive acceptance test for the build case.
Implemented type builder activator.
fix rails_completion performance

since i'm using noexec gem, my whole rails environment is loaded
when reading completion options from .rails_generators~ file.
just ignore RUBYOPT env variable required by noexec.
Beowulf-Scyld/beowulf_compute_node_health_check.pl: Adjusted threshold for throwing syslog alerts based on running every 10 minutes from cron instead of 30
Beowulf-Scyld/beowulf_compute_node_health_check.pl: Clear the node stats if the node_state is down/error/boot
Beowulf-Scyld/beowulf_compute_node_health_display.pl: Added color to the text output, changed failed monitor states to be red only if above a threshold, replaced depreciated <font> tags to CSS styles, made the count beside each status a smaller font
Handle "RVM" initialization if it is present
vim and i3
add some personal bundles
update
Bump for today
[helpers] Added required_fields helper
Refactor to use required_field helper
Refactor assets/javascripts
Added cancan and spec/support/auth_helpers
[spec/requests] Refactored so specs are using auth_helpers
Delete spec/support/authentication_helpers, move sign_in_as! method to auth_helpers
Fix specs after change from country_id to country_numcode
Refactor migrations
Annotate models
Fixes youtu.be urls
Changes to BDD style should for testing
Adds tests to webRemix.generate
Adds tests on web-remix.getNickName
agregar carrera ...
agregar carrera ... finiquitando las relaciones: ciudades, instituciones
nueva interfaz del modulo game, agregar carrera listo (falta relacionar al usuario)
Define missing entries for CARD_NAMES_TABLE

Close gh-1.
Add a descriptive name to championship-finals

The name is quoted from:
http://hatokura.flipflops.jp/wordpress/archives/686
added neosnipet.vim
ctagsがうまく実行できないバグを修正
Fixed run time error with solution I found at http://www.scala-lang.org/node/6695 using getClass().getClassLoader() this is apparently a bug
bug/scheduler: BS/CS用の衝突判定式が間違っている？
WUI/Client: 表示崩れの修正
add events by track report
Add translation of Installation section on 01-basic-usage
Added point diff calc in rankings and display on views
Fixed the issue of league director overwrite email not being used in email system
Updated user profile to allow users to change their email address
Updated duplicates to not show default minors.
another attempt at issue #2

Signed-off-by: Keegan Brown <brownkg@peteramayer.com>
Primitive Game Suggestion on Event Page
Initial commit
Hello world!
Merge remote-tracking branch 'choose_remote_name/master'
chinesejie
Merge remote-tracking branch 'choose_remote_name/master'
Solution for 10041 added
10082 finished
Make it easier to disallow robots crawling.
Changed operator for account to is when searching for invoices
Fetch URL asynchronously
Use my version

Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	erc-image.el
Merge
Change hook name
Remove redundant and deprecated comment

It is in the REDAME
Insert the image at the end of the message
Remove deprecated comment in the README
Merge pull request #2 from davazp/master

Retrieve URLs asyncrhonously and show the image at the end of the message
Add test for push notification
Use specific layout for the front page.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge branch 'gh-pages' of github.com:killbill/killbill into gh-pages
added empty vendor folder
updated composer.json
Init
_
+
P
Uh...
Fixes
fix bib
waf
Fix bib entry for "robotics"
Fix urls rendering in bibliography
Add more references
Clean up wscript
Prepare for adding literate code
Merge nyatris and nyatris-report
Start converting nyatris.hs to lhs
Add whitespace to make lhs2TeX indent code nicely
Ongoing work on lhs...
Done with lhs comments
Shuffle preamble a bit to fix hyperlinks
Move figures closer to their first mentions