labofsahil/github-event-dataset-2012 huggingface dataset:
portability: Improve x86/amd64 compatibility
repository: add a getter and remove function for git's prepared message

The 'git revert/cherry-pick/merge -n' commands leave .git/MERGE_MSG
behind so that git-commit can find it. As we don't yet support these
operations, users who are shelling out to let git perform these
operations haven't had a convenient way to get this message.

These functions allow the user to retrieve the message and remove it
when she's created the commit.
Add function to query for compile time settings.
Merge pull request #849 from scunz/git_caps

Add function to query for compile time settings.
attr: Do not export variables externally

Fixes #824

Exporting variables in a dynamic library is a PITA. Let's keep
these values internally and wrap them through a helper method.

This doesn't break the external API. @arrbee, aren't you glad I turned
the `GIT_ATTR_` macros into function macros? :sparkles:
Merge pull request #848 from carlosmn/pending-message

repository: add a getter and remove function for git's prepared message
repository: Indentation
Merge pull request #850 from libgit2/attr-export

attr: Do not export variables externally
Merge remote-tracking branch 'nulltoken/topic/amd64-compat' into development

Conflicts:
	src/netops.c
	src/netops.h
	src/oid.c
win32: set errno to ENOENT or ENOTDIR when appropriate in do_lstat
Added comparison funcs
labeled request -> labeled doc

rm old implementation, use pure version of @alevy's
Use elemsize instead of possibly arbitrary strides.
Ignore dimensions==1 in PyArray_UpdateFlags
Fix ctypes test for new contig flag logic.
Remove unnecessary strides cleanup.
Make FromDescr return new flags (through _array_fill_strides).
Minor cleanup
actualizacion rapida de la interfaz
Fixed FSM bugs.
bettteer
Fix Bug : Quaternion multiplication unexpected behavior
Merge pull request #53 from HaZuki/FixQuaternionSpike

Fix Bug : Quaternion multiplication unexpected behavior

Matches description in Bug 631
https://jogamp.org/bugzilla/show_bug.cgi?id=636
improved seed data, added authorizations, cleaned up views, FB email update
Add PI constants
Add Shoes::Arc
Add ElementMethods#arc
Arc: left, top, width, height
Arc: add stroke and fill
Arc: remove duplication in @width, @height

ElementMethods#width and #height delegate to @gui, so there's
no reason to store width and height as instance variables in
the DSL class.
Arc: Add shell of Swt implementation
Arc: Add Swt specs and implementation
Arc: Spec #arc dsl method
Arc: Spec alpha
Arc: #angle1, #angle2
Arc: Fix drawing direction, Swt specs
Arc: Draw in the correct position
Add gemspec, Rakefile, README.md, version module
Modify gem description
Remove j alias for ERB::Util.json_escape
AR::Relation#model would be a better API than AR::Relation#klass
Fix occasional microsecond conversion inaccuracy

ActiveRecord::ConnectionAdapters::Column#microseconds did an unnecessary
conversion to from Rational to float when calculating the integer number
of microseconds. Some terminating decimal numbers in base10 are
repeating decimal numbers in base2 (the format of float), and
occasionally this causes a rounding error.
Patch & explanation originally from Logan Bowers.
Fix merge error when Equality LHS is non-attribute

This is at best a band-aid for a more proper fix, since it won't truly
handle the removal of the previous equality condition of these other
nodes. I'm planning to put in some work on ARel toward supporting that
goal.

Related: rails/arel#130, ernie/squeel#153, ernie/squeel#156
Merge pull request #7352 from aripollak/microsecond-timestamp

Fix occasional microsecond conversion inaccuracy
column default extraction should handle newlines.

Fixes #7374
Avoid deep_dup when intantiating.

deep_dup is slow. we only need to dup the values, so just do that
directly.
Optimize instantiation for models which don't use serialize

Those z's were hard to type.
The default value can be set once in #column_defaults

Rather than doing it every time an instance is instantiated.
Avoid #any?

any? will check that each item in the array is truthy, as opposed to
!empty? which will simply check that the array has length. For an empty
array, !empty? still seems to be faster than any?
Optimize for the happy path

Checking respond_to? incurs overhead, and most of the time when
assigning attributes it will return true. So just handle the
NoMethodError instead.
align them assignments
don't call method unless we need to
Pull more serialize code into a lazy included module
Update to activerecord-deprecated_finders on generator
Merge pull request #7381 from IPGlider/master

Update to activerecord-deprecated_finders on generator
Merge pull request #7380 from ernie/fix-nomethoderror-on-non-attribute-equalities

Fix merge error when Equality LHS is non-attribute
Replace deprecated `memcache-client` gem with `dalli` in ActiveSupport::Cache::MemCacheStore

memcache-client was deprecated in favour of dalli in 2010.
Add test to cover increment/decrement of non-existing key in MemCacheStore
Merge pull request #6903 from guilleiguaran/dalli-memcache-store

Replace deprecated `memcache-client` gem with `dalli` in ActiveSupport::Cache::MemCacheStore
Forgot to load your images.
Fixed: unit \= unit.
Move to skeptic 0.0.2
working more on cup grammar.
fixing constructor in CastExpressionNode.
done with grammar for now.
fixing build config.
changed tokenize and added merge sort example
Merge branch 'master' of github.com:smessing/Hog
cleanup for zeros, eye and _new
matrices: docstring edits
relax django version pin
Version bump to 0.4.9
Add improved error pages, as well as rewriting most of the error handler
Added appropriately hipster logo
Bump version and README
綺麗に並ぶ始まりの御三家
Finished splitting TargetPlatformConfigurationGenerator into various
components
Now you can invite registered users to your flat
Merge branch 'sprint_2' of github.com:spacedone/FB into sprint_2
Moved all handlers URI's from My_Configuration to My_Handlers.

There's currently no good reason for being able to change these in the
configuration file.
Merge branch 'sparre'
bugfix
insert convenient template for extensions
Fix Danish localizations (24 hour time, 'månede' -> 'måned')
Added max_gists check with error message
md5 scores
updated to rev 7968
- Fixed rounding errors
- Started user interface
LXY-10.16

浏览框架
Merge pull request #6 from sydiz/liuxiaoyu

LXY-10.16
Fix ActionDispatch::ParamsParser::ParseError message for XML and JSON parsers.
Get the source directory right for the plugin
89: Added ability showing all banks
Fail textures
Minor editing to Maven instructions.
Try to install Kotti using setup.py dev alias instead of using pip with requirements.txt
Removed the annoying thin grey line from the Queue splitter widget.
Also made the ContextWidget header cursor a PointingHand because
consistency is good.
"check" mode works now
Refactored GUI cod.  Can now hopefully extract functionality :D
Removed caching of Manager objects
initial commit: docbook

Signed-off-by: tfreese <commercial@freese-home.de>
Update player card
Working on rss.
rss feed show 3 mos not working
Fix rss feed I think.
timeUnit() needs to return a two-item list, and it shouldn't subscript numbers...
Changed Advices naming
Modification of the README.
this aint on heroku no more
Makefile changes pointless. scanner.c Changed res
Updated bugfix according to Jerome suggestions

password check is done at lib.php instead of externallib.php

Conflicts:

	user/lib.php
MDL-30878 core_user_update_users user password is reset if not specified
MDL-31335 message: wrapped calls to mtrace() in email_to_user() within a check to make sure its a CLI script
MDL-28386 Authentication Fixing user id issue with logs when a new user is added
MDL-25027 Web Service: removed user info(firstname,lastname) truncation for GUI-WS consistency.

Currently there is no validation on user info (firstname/lastname) in user/editadvanced_form.php
MDL-25027 Web Service: added email validation to create_users() - just like GUI
MDL-29256 Fixed incorrect calculation of contentformat

Legacy Resource modules of the type Web page force the HTML format for
their content. The format stored in the reference field is valid only
for legacy resources of the type Plain text page. See page_20_migrate()
function.
MDL-26496 Lesson Module: removed warning when no answer is selected from single choice question
MDL-31348 calendar: event links not using user timezone

thanks to Ben Thomas for the patch
MDL-31399 Lesson Module: Fixed horizontal scroll bar issue when using rtl language format (eg: arabic)
MDL-29161 weblib: moodle_ulr::out does not cope with array params.
MDL-31721 question editing: improve working for Show num correct

AMOS BEGIN
 CPY [shownumpartscorrect,question],[shownumpartscorrectwhenfinished,question]
AMOS END
MDL-31729 questions: files for hints are not moved or deleted.

The files that belong to the question hints are neither moved when the
question is moved to another context, nor deleted when the question is
deleted.

Oops! How come no one noticed that until today.
Automatically generated installer lang files
MDL-27793 Themes : fixed base (and other themes) theme's loginbox
 - fixed translated lengthy terms were being clipped
 - fixed clipping and positioning of loginbox in rtl and ltr languages both
MDL-27793 Themes : fixed "remember username" wrapping unnecessarily.
MDL-27793 Themes : review changes - removed .dir-rtl from .loginbox selector rule to be default css rule. made them same width too.
MDL-29229 message: Set contactlist pull-down width to not exceed parent columns width
MDL-22896 libraries: Updated regular expression in html2text, for replacing unknown/unhandled entities
MDL-31546 wiki: remove stray semicolon

causing errors on oracle

Thanks to Jonathon Fowler for the patch
Recommend pip instead of easy_install

Use pip instead of easy_install in installation command for pyrobase.
Allow text/xml parsing as well. Prevent xml2js from converting single elements to arrays.
Bump to 0.4.2
tweaks
further tweaks
Merge branch 'gh-pages' of https://github.com/torchbox/ogn into gh-pages
Installation/configuration update
Refactoring the taggind feature

This is the first step of this refactoring. The new plugin based solution works ,only has to be tested with he poc together as well.
Merge and a small change in the Doctrine2TaggingTest
lengfact
support unquoted etag for older broken Cloudians
return key so user can manage uploaded parts
Add GMTUsage class to track x-gmt-usage header data
Add policy parameter support to copy_key().

- Similar to other API which add a key or a bucket to the S3 server,
  Allow the user to override the default canned-acl which is applied
  to the new key. This default policy override is only used if the
  preserve_acl parameter is False.
Merge branch 'add_multipart_copy_versionid' into copy_all_toms
Edit script.js
message.c: visually separate :! ex BANG commands
feature: new CursorLineNr item for emphasizing

Add a new CursorLineNr item that can be configured independently from
both LineNr and CursorLine.

Screen: http://devel.japh.se/vim/wim_cursorlinenr.png
Merge branch 'play' of github.com:trapd00r/vim into play
add .gitconfig
options.txt: add new undocumented "num" item to 'fillchars' docs
runtime/syntax/2html: add "numfillchar", "numcol" items
fix gitignore
-x stuff in root dir that should't be +x
-x src.info
feature: give current linenr her own isolated attr
feature.h: define USR_VIMRC_FILE{,2,3}
Flyttet bemyndigelseimporter til https://github.com/trifork/sdm2/tree/develop/bemyndigelseimporter, tilføjet den til checkout-script
DataLayerIntegrationTest#ifARecordIsMissingInANewDatasetTheCoresponsingRecordFromAnyExistingDatasetShouldBeInvalidated og tilhørende data
spaste can work on lists now
trimmed leading and trailing spaces returned in the word lists
added asignment operator
add nhieu
delete
Corrupted the save file at the eastern end of Guardia continent. Warped to west of Melchior's hut.
fixing rtl in interleaving TYNSTEP-343
loader should accept selector
updates internal depenedencies
Big commit.
   1) Support for ESP allele freqs.
   2) New SO terms from VEP for SVs.
   3) standardized VEP/snpEff attributes.
HBASE-5874 When 'fs.default.name' not configured, the hbck tool and Merge tool throws IllegalArgumentException (fulin wang)


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1345902 13f79535-47bb-0310-9956-ffa450edef68
HBASE-6067 Addendum adopts suggestions from Daryn


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1346057 13f79535-47bb-0310-9956-ffa450edef68
HBASE-6158 Data loss if the words 'merges' or 'splits' are used as Column Family name

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1346095 13f79535-47bb-0310-9956-ffa450edef68
Add quoted_text parameters to Conversations API endpoint
ui change
pop window finish
增加到最近消息里去
Merge branch 'master' of github.com:uning/sanguo
re-generated docs
make_doc is now 'retargetable' using the TGT env var
Unfinished Unittest

unittest for snsapi and sina. Some changes to errors, so that argument
can pass into Error.
Merge branch 'master' into unittest

Conflicts:
	src/snsapi/errors.py
	src/snsapi/snsapi.py

Conflicts are mainly due to obsolete 'config.json'. This config file is fully retired now. Logic in branch of 'unittest' may require
some fix, especially for those related with 'config.json'.
resolve logic errors after merge.
line break: change CRLF to LF(on unittest)
Merge branch 'master' into unittest

Conflicts:
	src/snsapi/errors.py
	src/snsapi/plugin/qq.py
	src/snsapi/plugin/sina.py
	src/snsapi/snsapi.py

All conflicts are resolved by keeping 'unittest'
mock commit
Unittest 0.1

The rough structure of snsapi test is initialized, I think.
Fix the line delimiter problem on Windows

check this page to understand how .gitattributes works.
https://help.github.com/articles/dealing-with-line-endings.
I hope this problem won't happen again :(
Line delimiter problem commit again
Line delimiter2
Line delimiter problem solved!

All file lines are ended with LF.
Try to fix warning
Miss some comma in channel.json.example
Merge branch 'master' into forwarder
fixed meaningless test
get_post_by_idが返すpostのtagsをリストリファレンスに
blabla
Merge with latest pms
gemspec assumes that user kept all generated files

This commit allows the user be lazy and not update
their gemspec's `files` directive after deleting
unwanted files from their generated Rails plugin.
Cache (FileStore) clear should keep .gitkeep
race_condition_ttl should be an integer
More using <tt>x</tt> instead of +x+ when the latter renders improperly.
Update AM example
Update contributing guide - run single test
Update guides - run single test for AR testing
Code-format references to config settings
Correct small consistency issue in AR querying guide
Add REST section to getting started guide
Merge branch 'master' of github.com:lifo/docrails
Remove unnecessary ).
Fix misptint

Injected at dab6c3aa484778b44c1b3cd2b9c46363916295ff
fix typo in ActiveSupport::Inflector#titleize
Document exception handling inside resce_from handlers
Merge branch 'master' of github.com:lifo/docrails
Make non English title indexable (such as Chinese or Japanese) using MD5.
Revert "Make non English title indexable (such as Chinese or Japanese) using MD5."

This reverts commit 70e0edf000289b1907b8aee386daf23577f6bc08.
Fix 'Can't mass-assign protected attributes: tags_attributes' in Rails 3.2.3.
Document ActiveSupport::Deprecations.behavior
init
merged readme
Wrote basic consumer for the backend side, and started http api translator.

When its done the idea is to add caching to it and for any mailboxes that are being long polled.
Add pom.xml for maven build
Minor edit to usage instructions
added lang attribute to html tag
far better env management
far better env management wasn't that better
Merge branch 'master' of git://github.com/prswb/prswb
Adding course show page
readme, правка баги со временем
Предзабил расписание
dont set input field focus when selecting text or after uploading a file
refactored box routes
dele null
Put PlayerForm methods to PlayerConfiguration, refactored Saite and
touchAString, added method soundFilter, changed GUIMain, MainWindow
[python] Make core.py a subpackage
[python] Move MemoryBuffer to own module
fix link program info bug for gl2x
Test tidying.
Część 2
Little fixes in upload images for products. Now, if error exists when upload image, you are warned
Fix conflict in TODO file
finalizado tsb
Add a note on bug 738530
Remove _syncScreenEnabledValue()
set onidle callback only once
Actually pass the idleObserver into the the Idle API
For idle timeout, dont't turn the screen off instantly
Handle wake lock
gjslint
Remove useless self = this
Loading icon for app page load
Better logic
Fixing permission handling during build process.

After the 'background' permission any other permission was ignored.
Removed contacts from dialer. Demo optimization.
Contacts code clean up and deletion of unneeded fonts.
e.target.dataset -> dataset
Monday morning linting.
Actions in buttons removed by CSS
Lint
Fixes fast_install excluding indexedDB folder
Added some padding in the text input
Merge branch 'feature-enable-fast-install-gaia' of https://github.com/lodr/gaia into feature-enable-fast-install-gaia
Updated cmake build comment.
Small fixes
Use the build in UUID buffer from libvirt
first file
adding second file
Merge branch 'a' of https://github.com/wietrek/test
Merge branch 'master' of https://github.com/wietrek/test
Merge branch 'master' of https://github.com/wietrek/test
modif file
Merge branches 'master' and 'a' into a
success or error  the last  I dont
build: make Python scripts compatible with Python 2.x

They were originally written for Python 3.x. Changing them to work on
Python 2.x as well is trivial. Tested with Python 2.7.3 and 3.2.3.
build: use "python" instead of "python3" as interpreter name

This works regardless whether "python" starts a Python 2 or Python 3
interpreter.
vf_lavc: fix compilation with latest libav

Remove a pointless and broken check for avctx->codec->encode.

1) The check does not test for anything useful.
2) AVCodecContext.encode is a private field and is not supposed to be
   accessed from outside of lavc.
2a) AVCodecContext.encode does not exist anymore in latest libavcodec,
    so this block fails to build.
Initial 2.0 commit

Redid views structure to split up nodes, lists, blocks, and admin into
different views. Completely redid and compressed CSS. Added access
plugins, now have 5 different list views, 2 nodes, and 4 blocks to
choose from.
adding sample for enrich mediator

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@130603 a5903396-d722-0410-b921-86c7d4935375
This webapp calls a database created through Storage server. 



git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@149651 a5903396-d722-0410-b921-86c7d4935375
updated new test

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@138146 a5903396-d722-0410-b921-86c7d4935375
change JS coding
fixed Martin's dumper.
Update awesome menu
forms - select disabled
typography docs adjustments
update to lcd
Added new feature to rebar xref to allow execution of custom queries. This can be enabled in addition to xref_checks. The new queries can be added to rebar.config via the tuple {xref_queries, [{query(), query_result()},...]}. It will exit with error if the result of running a particular query() does not give the query_answer(). For example:

{xref_queries, [{"(XC - UC) || (XU - X - B - (\"ejabberd_logger\":\".*_msg\"/\"4\"))",[]}]}.
hydra_cache is only needed for the tests
adicionado devise e oauth
fixed not paid customer issue
Add eterm-color
add get argument type convert ability
correciones Menores
added aggregator to composition scorer.
linear_composition_scorer -> sum_predictions_aggregator
max_weight_composition_scorer -> max_weight_aggregator
order_statistic_composition_scorer -> order_statistic_predictions_aggregator
median_composition_scorer -> order_statistic_predictions_aggregator(0.5)
fixes

Change-Id: Iaa0f14f7b1745ef3139ad8fd6660205b58bc671e
Fixed  formatting of  id in generateId
rename program to reflect new name
Generate unique name for folder from the beginning
12.17 commit
convert habtm to has_many through
display a basic list of plays in a game
(extremely) basic permissions check for plays
add missing primary key
add play unit test helper
add a somewhat functional controller for plays
add marginally functional list of plays to game/show
Test plays
Fix up layout
Escape invite and uninvite javascripts
Save character name in result
修正多重for逗号有歧义的问题，补测试用例
add postgres-server-dev dependency which is needed by the pip install (psycopg2==2.4.1)
Merge pull request #2 from arthurlutz/patch-1

add postgres-server-dev dependency which is needed by the pip install
Removing the unnecessary href parameter in add_css_snippet.
Allowing overriding of CSS config values through Sputnik's config.
Fixing the handling of home page URLs.
use responsive bootstrap
trimed games
added page-header and modified indentation
DateTime as argument of Sport, and use it to requestSchedule.
added github ribbon
added path, added args to method schedule
able to specify year and month
added ref and pager.
Removed Queue, Search and TimeSync from main repository
Updated docblock
Micro-optimization
Remove unused variable
added a getter function for checking if the form has been validated
Merge pull request #1947 from bakura10/service-manager/fix

Service manager/fix
added a test for it on evans request
Expand use statements to multi-line
Remove @abstract statements from Zend\Console
Add suffix Interface to all interfaces
Use Zend\Console\Exception\* instead of SPL
Add BadMethodCallException & fix Exception imports
Fixed static string callback bug for PHP 5.4 or older
Changed to old behavior for calls with more then 3 arguments.
Added minor performance improvement for static string callbacks
Merge pull request #1948 from macnibblet/hotfix/form-has-validated

added a getter function for checking if the form has been validated
Add Mvc\View\Console\ExceptionStrategy

- Add ExceptionStrategy for Console that will by default display any exceptions that have been thrown inside action
controllers.
- The default message can be overridden by using ExceptionStrategy::setMessage() or by setting config value
view_manager.exception_message
Add missing SM aliases.

ViewManager registers its listeners and strategies with SM. This commit adds additional aliases for Console-specific
and Http-specific listeners, so they are easier to discover in 3rd party code.
Fix AdapterInterface to latest interface name changes
adding missing defaultscrollingstyle var, acccessors, and implementing in invokable
debug statements everywhere
add one command to run them all
add imageinfo
"pull"
Converted XMLOutputterTest from JUnit 3 to JUnit 4.
added fxml minimap
Use setTimeout instead of setInterval for timer.
Conditionally include assert.h

Even though multiple inclusions are allowed by the standard, Darwin's assert.h creates multiple definitions for __assert_rtn.

Fixes compilation with clang.
swscale: update deprecated calls
Identify duplicate libavxsynth with dlsym.

There may be some reason I'm not privy to to prefer shelling out to nm, but this works just as well on OS X.
Install avxsynth C interface with other headers.
Stray format specifier.
FB integracija komunikacije s baznim REST-ovima
improved: sidebar onclick now on LI

improved: some sidebar CSS
Moving algo implementations to earth project
Backing up
re-Fix of small translation issue
color de a
Implementation of zoom to impact layer and hide exposure layer. Closes #105 and #140
Improved Chapter 1 exercise 1-23
push init pour client-ng
Use regexes instead of hardcoded file names
Use regexes instead of hardcoded file names
schema checking didn't catch built in types derived from integer
fix getlayer function and outline more fucntions
Dir.chdir before triggering before_render events
Trying to get Travis CI working
Revert "Removing Travis CI for now (builds fail but specs pass locally under exact same conditions)"

This reverts commit b7c2691fdae82db62e9d2576690c888277ba6cf6.

Woohoo!
Updgrading gems, using static versions
Forgot these
Slop syntax improvements, splitting server out into stasis-server, development mode improvements
Forgot to remove server spec
Removing server from README [ci skip]
Basic specs for local variables
Trying to reproduce locals issue [#54]
Stasis.register doesn't blow up if no Stasis instances, prerelease
Merge branch 'master' of git://github.com/winton/stasis

Conflicts:
	bin/stasis
wird er schon neubauen
Сделал более менее работающую авторизацию через контакт
ENH: Add consistent similarity measure for tuning

When choosing parameters in the correct scope
for balancing speed and quality of registration, it
is very helpful to have a consistent view of the metric
value throughout the entire registration process.

Add "print-similarity-measure" option to antsRegistration
to measure the CC similarity metric between original fixed
image and original moving image at each itertion.

git-svn-id: https://advants.svn.sourceforge.net/svnroot/advants/trunk@1702 fd2da0a4-d968-48df-9cb5-d8c496287cbf
initial commit
Merge https://github.com/BartLH/pySpot
[MOD] Version switched to 7.3.1-SNAPSHOT
Revert "[MOD] Modify help for HTTP and error message to reflext changes in the"

This reverts commit 5ff3d4e5f709f35d2c42e25d57910a8569aae46d.
Merge pull request #457 from charles-dyfis-net/arbitrary_jvm_args

Allow arbitrary JVM arguments to be passed to wrapper / startup scripts
savetoken objid default null, mivel type3-ra nem kuld id-t
messages remis en francais
removed references to movie
PV: double-click to select product
ID: double-click to select member
Complete rewrite: Enable configuration changes on-the-fly; no recompiling needed.

Signed-off-by: John Leary <john.leary@gmail.com>
ssd rewritten to run more efficiently and use configuration file
ignore ssd, scanner, scale files
$_SERVER['PATH_TRANSLATED'] deprecated; replaced with $_SERVER['SCRIPT_FILENAME']
xboxMsg messages now capitalized correctly.
Handle gracefully when $CORE_LOCAL weight isn't set.
Handle blank $CORE_LOCAL->get("weight")
Merge remote-tracking branch 'origin/master'
stop tracking .DS_Store and logfiles
feature: settings can now be split between ini.php, ini-local.php
global settings for George Street Co-op
ignore fakereceipt.txt
ignore scanner and scale output files
ignore (and stop tracking) all logfiles in log directory
abort quietly when trying to update a nonexistent ssd.conf
ignore compiled ssd executable
CC info in reprints
WFC legacy stuff
Merge remote-tracking branch 'georgestreet/master'

Adds optional ini-local.php, revised ssd driver

Conflicts:
	pos/is4c-nf/ajax-callbacks/ajax-poll-scale.php
	pos/is4c-nf/gui-modules/fakereceipt.txt
	pos/is4c-nf/ini.php.dist
	pos/is4c-nf/install/extra_config.php
	pos/is4c-nf/lib/drawscreen.php
	pos/is4c-nf/lib/prehkeys.php
	pos/is4c-nf/scale-drivers/php-wrappers/ssd.php
#31 Bug fix: white space of gif by ImageMagick
several small changes/bug fixes.
[0.6.0.193] Implement Unit.HasEffectType wrapper.
Removed redundant console .log
Fixed CAPE-OPEN stuff;
Fixed Gibbs element matrix editor;
Added more composition options to the stream composition editor.
Added dig.
QUASAR: need lower case 'c' for config stuff
Fixed null pointer exception when message with no MessageKey is passes in.
Merge pull request #11 from sheetalparade/bugfix

Fixed null pointer exception when message with no MessageKey is passes i...
mehr oder weniger lauffähig

alles etwsa umstrukturiert
Release of navajo deploy non-osgi 1.1.1
Info and simplified file structure.
Info
PLR getIntValue
ProcessorState
Resource primityvai
PLR getIntValue
ProcessorState
Resource primityvai
PLR getIntValue
ProcessorState
Resource primityvai
Adding ScoreManager and ScorePanel
Refactored java-js interop to be more modularized.
first commit of the report
Merge
merge
Fix update
* Added some security to multiple errors
MDL-29348 Repository: WebDAV displays a breadcrumb
MDL-30905 Accessibility: user profile uses table headers
birthday de-DE
Merge pull request #234 from trob/german

birthday de-DE + Question
lsit plugin updates - codestyle and one error
Closes GH-336
couple of gannt chart fixes thx  FaBa
strict notice fix
fixed: bobo in form.js meant that the rowid was never set
Closes GH-534
fix HFileSystem vs HdfsFileSystem bulk loading bug
srand przeniesiony na poczatek konstruktora Engine
log_workout

log_workout finished. aded some margins to make it look sexy.
AndroidManifest

Locked LogWorkout to portrait.
私

実装中要件 #10,#0: 「マギーってフラダンス踊れるの？」
rename the test for excerpt with speration
fixed some memory leaks. it is a work in progress
Corrected numerous numerical conversion warnings.
Removed useless urllib
Add option for IPSet
README: corretto spell e rimosso riferimento wget
test HEAD field
impl register() method
[Image] Creating directory in save if it does not exists
modified seeds.db such that it produces a todo list for this project
Merge branch 'master' of github.com:HACD/tasklist
changed url to urlRoot
Tweak input box size and reskin calendar mass invite frame.
Update bank for MoP.
to add new restaurant
get local skyline and merge it in one reducer
fixed OpenCL detection in Linux (patch #2261)
Add support for multidimentional matrices into the sanity checks
Merge pull request #227 from taka-no-me:sanity_MatND
Use temp file's mtime to check for changes.

This handles custom templates with pre-filled data.
Added subcommand to report bugs in hubugs.

Closes #26.
[QA] Only import ServerNotFoundError from httplib2.

This kills the final warning when pushing to ASTs servers.  This is perhaps the
one time I don't agree with Matt on a style issue, but...
Allow setting of --host-url in git config file.

Closes #39.
Merge branch 'feat/host_url_in_config'

* feat/host_url_in_config:
  Allow setting of --host-url in git config file.

Conflicts:
	hubugs/__init__.py
Finished the card animation.
Removed ul class in contacts.css
Merge branch 'fill-in-style'
Update _build/properties/properties.getcache.php

added cacheReset parameter
refactoring
added own blogging platform into profile
user options for specs frequency and names
new sats dirs created
fix MPS-15870 exception on startup
Merge branch 'master' of ssh+git://git.labs.intellij.net/mps/mps
move components for java stub indexing from workbench to platform (FU in stubs is available in plugin)
saving options per-concept
fix problem with editor tab caption
find usages saves options for each concept separately
rebuild required models
Merge branch 'master' of ssh+git://git.labs.intellij.net/mps/mps
rebuild baserLanguage.behavior
fix migration script
MPS-16132 [build:MPS-25.9177] java.io.UTFDataFormatException : encoded string too long: 339636 bytes: encoded string too long: 339636 bytes
MPS-16132 part 2
Throwing exception if it was not possible to run sub-process
MultiMap copied from Idea
first version of exe build
[#845] Enable PUT of files above 2GB
[#846] Tighten up visibility
Simpler and more comprehensive method naming in monitor
Simpler method naming in Timeout
Port traffic handler to netty 4
Added network encoder, add a pipelineFactory class, and fixed a major networking bug which allowed one connection only"
Fix crash in widgettreemodel after widget destruction

Fixes https://github.com/KDAB/GammaRay/issues/9
Conclude root directory test.
Added in the base working code for Garrysmod 13, alot of things are still borked, but its a starting point.
Merge pull request #1 from generalwrex/master

added in the base working code for gm13
add default lang
Put a nice Readme
Deuxieme
Add TODO
Test TODO 2 edited by aymeric
Test TODO 2
Add ligne
Merge branch 'feature/todo' into nicereadme
Merge pull request #3 from Kenlodin/nicereadme

test2
[Issue #45] Created person in seeds.rb
Ninja: don't crash on returned 0 pointer
Merge topic 'cmcldeps-needs-cl' into next

4a35bd0 Ninja: don't crash on returned 0 pointer
Add support to ctest for GTM mumps coverage.
Merge topic 'mumps_coverage' into next

e6412e0 Add support to ctest for GTM mumps coverage.
new file:   lab2.java
inputmanager to master branch
setting up latest version to my home computer
started BattleHandler which will know battle and battlemenu
had slight changes on few class to make game work on home computer, changed them back
nothing special
battleHandler is now removing dead enemies and heroes from modellist
merged changes
Fixed failsafes + statuses
Updated CREDITs with eric , forgotten (not forgotten on the web, though, since weeks ago).
added the social slider
Merge pull request #2 from jfelts/master

added the social page
Add audios
Release v0.2
FIX: remove default language-support
Added gitignore
Added week5
commit message
Fetching the rewardgold differently and messaging the victim about it
Automatically create an account when mapping SpeakUp account IDs to CServ account IDs
Ensure there is a unique index in the cdr collection
Refactored nl.limesco.cserv.cdr
initial setup for Lua FileSystem object
enums for possible basedirs
FileSystem.ReadDirectory
deprecate Engine.userdir
most of an EventQueue reimplementation in Lua
proxy event calls through to lua
no longer need to keep LuaEvent objects, so just allocate them on the stack
add a little protection
remove the unnecessary method call syntax for EventQueue methods. yes, breaks backwards compat, but I think its nicer
move EventQueue docs into the lua file, and clean up
expose ticks to lua for debugging
reimplement event callback timing in lua
rename ClearEvents to just Clear
documented newly-exposed EventQueue methods
fix a few minor glitches in the existing docs
ignore the first arg on EventQueue methods so that the method call syntax works. preserves backwards-compat and keeps things consistent
split up ship definitions to have only one per file
update references to specific ship types to use filenames
identify ships by ship def file name
add Gui::Image::SetRenderDimensions to control Image display size

This controls display size independent of texture pixel dimensions.
Fix message prefix to send console
Change plugin name and prefix, mcbans to MCBans
Added package installation instructions.
Markdown syntax corrections.
Added details regarding the `-g` installation option.
Update block types. (Add Anvil, Brewing stand, Beacon, Command Block, Wood Button, Tripwire, Item Frame)
Thanks eclipse for the remark about the open filepointer.
VinesSpread finally :)
Prevent players from breaking ItemFrames.
Improve ZoneCylinder Form a bit.
[2.5.3] and lib update.
coms4771-hmwk4: finished
change logical constructor to take any type and convert it to bool manually to avoid MSVC performance warnings
Fixed fliplr
converting remaning max_extent occurrences in statistics
tentative in the dark to fix clz for msvc
logspace
disable SSE4 and AVX for debug test targets for valgrind compatibility
remove some specializations of container traits that cause problems with scalar with value_type. Fix #328
revert to electric gazebo config, included switch for manual shutter in keyboard controller
glyph for navigation bar and toolbar
(hw2P2, top) Don't use p3_top.
(hw2P2, tb) No p3.
(hw2P2, tb1, tb2) Merge Marco's.
(hw2P2, tb1, tb2) No p3.
(hw2P2, DM, tb1, tb2) Use mem_data instead of dmem_data.
(hw2P2) Update state machine. IR_CYCLE = 8.
moysteea

commit
moysteea

내꺼 니꺼
Use concurrentdictionary over dictionary for IdDelegates
count calls now take a func over actions so they work with the returned value and not the passed value
Quite a bit of tweaking, have to test them out later on
Correct handling of Artwork when database field is set to NULL.
(cherry picked from commit 4646e7f56fc97f62d05d42b5896e8eceb361492e)
Tweak DictData behavior to properly function with Properties.
(cherry picked from commit 662b5e83cfa103fc3aed86c194b2fa2c6b9424d8)
Include signal.h in mythbackend/main.cpp for SIGINT
"Added throttling to entry saving"
Add scope check method to libsyncing:
Start refactor of provision code
Refactor provision code
Fix sycning for table based scopes
Update build targets for new syncing files
Add build batch file
Update 2/0000/0040.txt
Merge pull request #771 from turex/patch-68

Agg. trad inglese
Aggiunta trad, inglese
root-update
sudo
ggl for pull submodules too
Merge branch 'fixes'
Merge branch 'master' of github.com:Netflix/servo
Merge branch 'master' of github.com:Netflix/servo
Provide an option for the MetricPoller to get values directly
Add description for the useLimiter param
Merge pull request #106 from dmuino/callable

Skip limiter option
Fixed iOS build.
Preventing disposables from being recorded twice.
Merge remote-tracking branch 'upstream/develop3d' into develop3d
Merge remote-tracking branch 'upstream/develop3d' into develop3d
Fixed 2MGFX tool and recompiled effect files to reflect the change.
Removed duplicate _playLists in MediaLibrary.
We now restore the ScissorRectangle during a GraphicsDevice.Clear() on GL.
Merge pull request #722 from SickheadGames/develop3d

ContentManager Disposables, 2MGFX Fixes, GL Scissor in Clear
Now everything should work fine.
Merge branch 'develop3d' of https://github.com/mono/MonoGame into develop3d
Whoops
Bump plowshare version to git20120916
Merge remote-tracking branch 'upstream/master' into plowshare
Merge pull request #131 from aforemny/plowshare

Plowshare
Add new package netrw, version 1.3.2.

The upstream URL unfortunately wasn't available at this time, so I provided an
alternate mirror. I checksummed the file against the hashes from various
distributions in order to make sure it's the right one.
netrw: Allow to specify checksum hash library.

Within netrw the only checksum algorithm that is available is MD5. We thus make
it possible for users to override this, so algorithms from other libraries such
as OpenSSL and MHash can used.
netrw: Add missing license to meta attributes.
Merge pull request #56 from aszlig/netrw

Add package netrw
Change model_class_name behaviour

- Use classify instead of capitalize to make the behaviour of the generator
  more similar to Rails model generator.

- Use underscore instead of downcase for consistency with the previous change
Merge pull request #246 from lucapette/change-model_class_name

Change model_class_name behaviour
Update CMakeLists.txt

Changed the project name (for Visual Studio solution's name).
Fix error message when trying to install a package already installed.
Remove a weird warning message in the solver
Further update of busprot headers (Previous failed)
open selections dialog as soon as you drag something new onto filters
add loadtest env; usage:'load=10000 grails -Dgrails.env=loadtest run-app'
Set-Hierarchie fertiggestellt
Update Interface/AddOns/AltzUI/locales/french.lua

Update french.
Update Interface/AddOns/AltzUI/locales/french.lua

Update
Update Interface/AddOns/AltzUIConfig/locales/french.lua

Update
Merge pull request #3 from D4rKleFou/patch-2

Update Interface/AddOns/AltzUI/locales/french.lua
Use Guid to refer to ParameterRef contents instead of a junky VariableRef
Holes offer applied stuff
Update _posts/2012-09-27-programming-methodology.md
slidecontainer
Reduce spawn rate
The first part to do not generate unchanged posts
Exclude feed and index file from modified check
Excluded archive from modified check
It is always a good idea to warp certain strings in brackets
Bugfix
Improved!
bullshit commentary
DOC: rst2ipnbpy -- added a header and minimalistic adequate --help description
Added link_names from neurodebian vm-6.0.5-132-gd9478dd
DOC: adjusted some and added more links in link_names
DOC: reference MDP and scikit-learn, use link_names to avoid double definitions etc
Moving over to quotefish jquery theme
select exercises 20 thru 38
I use now Eclipse, so i have some code style marks :)
Simplified string and character lexing
adding elapsedTime
Fixing sampler setting.
Changes for 2.4 tag
fix mpi formatting problem in slurm.conf man page
Document that gang scheduled jobs all must fit into memory
Merge branch 'slurm-2.4'

Conflicts:
	META
	NEWS
smap - remove debug
BLUEGENE - if a system is doing a clean start and there happen to be
hardware in error and job running on blocks as well this fix will make it
so new blocks are formed around the bad hardware and free the old ones.
BGQ - if a small block isn't found in the state file correctly set the
ionode_str
BGQ - when calling bridge_status_fini use the rt_mutex in the right spot
to avoid deadlock.
Always call the slurm_select_fini on ending the slurmctld to clean up
any underlying infrastructure.
BGQ - better cleanup for ending the status threads.
BLUEGENE - only call the fini for the plugin if on a bluegene system
Add logic to pass IP table records and correct some logging
Should get multi step ID working with LL
(historic) Version from 2008
remove obsolete -parens option
add currencybot for more currencies
Add some more currency names
- to _ in def:ecology of goods
restructuring process paper
tree: add support for shouldExpand function on column definition
Add provision for optional column.init method

Not touching editor yet and only touching tree lightly, since a
significant amount of changes are on other branches I have, which
I'll likely merge this to.
Merge branch 'col-init' into tree-expand

Conflicts:
	tree.js
Add _expanded update logic missed in merge; thanks swiftdemise
Add tests for tree auto-expand, both sync and async
Clean up styles on expand test page
Work around tree auto-expand error with sync data
Merge branch 'tree-expand' of git://github.com/SitePenKenFranqueiro/dgrid into maint-0.3
Sort context definition alphabetically.
Use slapos.buildout "dumps" to pass python list to zope.conf.in template.
Merge both mkdirectory sections.
Split request "config" parameter, one word per line.

Also, stop referencing reference implicitly pulled parts.
Add report url.
Tidstorage base url is not needed.

Tidstorage directly connects to the zeo servers.
Use 6tunnel instead of haproxy.
Interval value of 0 also desactivate timerserver.
6tunnel replaced haproxy.
Instanciate the ZEO servers.

ZEO servers listen on ipv4.
Always instanciate tidstorage.
Add ipv6 tunnels to provide external access to zeo and tidstorage.
Add promises.
Instanciate the zope instances.

Zope listen on ipv4.
Add ipv6 tunneling to access zeo, tidstorage.
Add ipv6 tunneling to provide external access to the zope.
Do not hardcode number of test databases
WIP.

Balancer has to be done, as well as frontend.
Logrotate squid logs
Update slapos.toolbox
BUG 2710. Fixed SceneViewStorage node's filename for MRB file.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21290 3bd1e089-480b-0410-8dfb-8563597acbee
BUG: files with no PixelData tag should be ignored

Some series come with extra files which are of Modality MR, but have
no PixelData - for example the vegetable scans here:
http://www.insight-journal.org/midas/collection/view/194

So we skip these and process only the multiframe pixel data.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21086 3bd1e089-480b-0410-8dfb-8563597acbee
STYLE: Remove executable bit from code in MRML/Logic.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20742 3bd1e089-480b-0410-8dfb-8563597acbee
STYLE: Improve readability and simplify code using smart pointer

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20502 3bd1e089-480b-0410-8dfb-8563597acbee
Fade in working.
Started basic ui
Making the ui prettier
Automatic library path setup. No more switching configurations
Moved library path setup to its own method.
added russian admin
More dobule-turn nightmare
Add guild (snoautorepair) repair
Fixing another minor bug, forgot to put in except statement.
Merge pull request #4 from emanuele45/marcus_master

Show the avatar is now an option (template_init) and retrieved from the ...
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/marcusforsberg/SMF2.1
! admin menu icons to a sprite, save ~30 calls hone each load

Signed-off-by: Spuds <spuds@simplemachines.org>
! allow spellcheck to work with both the editor and with textboxes

Signed-off-by: Spuds <spuds@simplemachines.org>
! changes to allow spell check to work with the text box that is
used in quick modify, signature, and quick reply with editor off
! loads the needed JS when the editor is off, otherwise its loaded
via rich edit (as it was)
! add in the full editor flag for the spell check call that need it
! probably broke some stuff, but more is fixed so its a step ahead :P

Signed-off-by: Spuds <spuds@simplemachines.org>
! use getText so we capture source or full editor

Signed-off-by: Spuds <spuds@simplemachines.org>
Merge branch 'master' of https://github.com/marcusforsberg/SMF2.1
Merge branch 'sprite'
Merge branch 'spellcheck'
Adds breadcrumbs.
More style for student studies.
Fixes typo.
Student studies show is complete. Some styling left.
Add html5 plugin
Rename files to windows convention
Change paths and guifont for windows
Add vsvimrc
Set tabwidth and shiftwidth to 2
Merge branch 'windows' of github.com:Szczyp/.files into windows
Added new ATM states stubs; added hourglass image to resources
Renamed Installation section for mandriva and added Theano update doc.
Added installation instruction for CentOS 6.
English fixes to install.txt (but see comments at
https://github.com/nouiz/Theano/commit/fcca361f341a18f972a0513ece7c09cc85b858ea#commitcomment-1246687
)
English fixes/improvements to CentOS instructions.
Merge pull request #14 from dwf/install_fixes

Fixes to CentOS instructions, etc.
Clarified a paragraph following code review.
Merge pull request #619 from nouiz/install

Install documentation for CentOS
Started implementation of Take Op.
Reuse advanced indexing in supported cases.
Added .take() member function, added test, fixed axis=None case.
Fixed output rank for axis is not None case.
Reuse advanced_subtensor1 if indices is a vector.
Reuse advanced_subtensor1 in all cases.
Added support for advanced indexing that reduces to x.take().
Merge pull request #1127 from abalkin/take-op

Take op [WIP]
Okay now the buttons are working
Added proper Logger to Java Implementation to control output
Added build.xml to create a robot.jar that contains the Java
Implementation
And then it worked.
add embedded video
add embedded videos
added stupid message
Escaped tag examples
Added further check to prevent duplicate vote form submissions.
Make POM more complete

Correct groupID: change "edu.ucar.unidata.sruth" to "edu.ucar.unidata".
Correct project URL: change "software" to "projects".
Improve <developer>: change role to "everything"; add timezone.
Add Unidata <repository>.
Replace version ranges in dependencies with single version.
Make slf4j-jdk14 optional.
Add source jar-file.
Add signing of jar files.
Add javadoc plugin.
Add <distributionManagement>.
Improve name of tracker directory

Change port suffix from ":port" to "-port" to accomodate Windows.
Improve topology refresh when no clients

Add boolean "refresh" argument to TrackerProxy.getNetwork() and set to
"true" when there are no connected clients.
Enable Connection.Stream.{Input,Output}.close()

Have the close() method shutdown the respective side of the TCP
connection.
Improve Util.getLogger()

Add static initialization of logger based on execution environment.
Add PubSubTest.testPublisherRestart()
Improve error handling

Improve DelayedPathActionQueue.stop().
Add ClosedChannelException to MinHeapFile.
Add SecurityException to Publisher.main() and Subscriber.main().
Improve log messages.
Remove "Hudson" directory

Because it no longer exists.
Improve distributed logging.properties

Set default level to FINE.
Added basic P2P support.
removed useless parameter

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6158 17fca916-40b9-46aa-a4ea-0a15b648b75c
improved hungarian notation;
addedo doxygen comments;
cleaned code


git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6159 17fca916-40b9-46aa-a4ea-0a15b648b75c
Typo, thanks t_kns

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6160 17fca916-40b9-46aa-a4ea-0a15b648b75c
Add some semi-useful javadoc
Revert "Revert "Revert "Add items to stock list"""

This reverts commit ceb65645abf1aa972b9521269570cf9581da911f.
Revert "Revert "Revert "Work on #65"""

This reverts commit 0fe70964377e8b6faa18c3433a773c42e30a1bad.
Questinon