labofsahil/github-event-dataset-2012 huggingface dataset:
fixed syntax errors in decoder, removed deprecated methods, changed line
endings for realz
Cleaned up some eclipse files that shouldn't be version controlled
Updated package preferences.
the sagan series update
Reset command queue on cmd clear.
Make haskell-process-restart work properly (refs #53).
Restart process .cabal configuration files changed (refs #53).
Customization for restarting the GHCi process on Cabal change with prompting (refs #53).
Don't replace buffer when stylish-haskell fails.
Use a temporary buffer for stylish (refs #54).
Typo in filename fixed.
Added packages to install_common.
Added jquery and fixed static files paths
Updated bootstrap and jquery
Disco ball implementation
clsbtns bugfix
Up version requirement for glob
Merge github.com:busterjs/buster-resources
Latest update.  Many changes.  Script almost works.
Fixing support for Ruby 1.8.7
Making use of duration instead of converting minutes to millis manually
Added references for SS 2011 report.
LPS-13051 Colors on Thumbnail of CMYK image are distorted
LPS-30418
LPS-30418 Autogenerated
Adjust process name
makes reconnections and buffering to a file actually work
testing mac to pc
fix annotation hover size
fix code folding
Added static pages (home, help) via ruby generate controller StaticPages (FIX: Added some files that were missing)
Added support for some multi-media files
Abstracted lengthy definitions from server.js
Fixed bug in Chromium
Extended to provide more thorough test
Additional files to test server's file support adequacy
Initial Code

Lexicon Works
updated target setup-dir routine def, added concept of build logs organize by datetime folders
First commit
Merge https://github.com/chrisdawe55/Music-Library
Tweaked smex section
Merge branch 'master' of https://github.com/christopheryoung/dotfiles
Setup script runs from anywhere now
Changed name of mac_setup.sh
Deleting alias
Broke out emacs.d related setup stuff into seperately runnable script
Fixed UTC time issue.
organized GUI main window code a bit better. Switched to using Qt's automatic slots.
new startup code, weakly-linked default interrupt handlers
Test resutls for quicklisp 2012-03-07 and ecl-11.1.1-606449eb-linux-x86, cmu-20c_release-20c__20c_unicode_-linux-x86, ccl-1.7-f95-linux-x86, ccl-1.8-f95-linux-x86.
Merge pull request #27 from cloudedge/pull-req-release-rails3anddb-master-3c6ccb6123

Move the crowbar.yml layout to v2 [10/27]
Import Berkeley DB snapshot, v5.3.21
Fix BR masks
working on adding features - unstable
Show street view on address page
New room created for schoolfront map
Adding LibGuides css & banner image

Committing my custom LibGuides css and banner image, for the first time.
core library used for college completion site
Workshop #2
we should not be tracking composer.lock, it is not the practice in any bundle
add gmond spoof
re-added a type hint
Added static page 'Help'
adding bash post
rubygems req
Use single data train during student info updating
Do not allocate any model id's ahead of time
ignore-from default value
Merge branch 'release/0.0.4' into develop
Move node api to its own module
Move job api to its own module
Make Job.create_or_update hambly
Make Node.config_node humbly
Merge branch 'feature/refactor-client' into develop
Add disabling job feature

but think it's better to set config.xml's disabled as true.
hmm...
Don't let error message contains HTML tags
Merge pull request #4 from cynipe/feature/disabling-job-support

Feature: disabling job support
Update and improv task description
Remove unused strategy options
Add README for disabled_job option
Bump up version to 0.0.5
Merge branch 'release/0.0.5'
Add timesheet_2102_beta property to user
Add setup method for context setup
Replace start() with setup()
Make multi-mode use setup(), too
Update src/floe.h

github sux
Starting faithful porting work on PowerTools.
Added FlxConverter project
Removed stuff which needs to be filled in
fixing soap communication
Adding neo4j repository
ajustando timing da animacao
s/replays.admin-box.com/replays.springrts.com/g
log Player[Accounts] creation, don't double-log Replay/Comment deletion
Fix require to be backward compatible with older rest-client gem
tweaked to enable user modules
Merge branch 'master' of github.com:dasher/express-on-railway
Added standard requirements
Added standard requirements
updated to latest createjs libs
Fixed default processes.
optimize output when running tournament
Re-factors pypath.py to make fewer assumptions.

- pypath(directory) lets you setup an app for any project directory
- importing pypath does not add 'lib' to sys.path
- load_exe() handles import dev_appserver.py
- manage.py explicitly arranges import paths
Base JB Mms inverted
Revert "Mms: added the option to change the soft keyboard type when composing messages"

This reverts commit 7f238a3dbb9c4dd66464075c22d35011f64ee589.
Twython
removing missed comment
cleaned up code using coder module
Things are actually looking kindof nice. I need to get the carousels frontend working. But its looking pretty good on the backend
Make arguments generic tuple non-private in `unstd.templates.Template`.
Document `unstd.templates.Template`.

* also improve example/unittest
Updates on Linux Mint.
Merge branch 'macport' of github.com:dennisferron/GameBindings into dev
Done merging macport.
Added OrientationHelperSceneNode
Tables of observed line intensities for HST 10

* papers/HST10/HST-10models.org:
  + Add table of line brightnesses that Yiannis sent
  + Add table with analysis of [N II] line ratios from the Keck data
Added simple Server, Connection Code
add defaults to instructions
import, lapozó méretének csökkentése, tisztítás
Image Votes Link
Add PublishCloudService.ps1 PowerShell script
Changed bank details
add convert from hex to char
Localize paired quotes for german.
Fix invalid key binding that disables dead keys.

See http://lists.macromates.com/textmate/2012-September/035552.html
moving __ attributes to the end of the completion list
update docs
bump to 1.1.1
sample on cover_url
Fixed issue #23 in original spree_digital
Updated _posts/inprogress/2012-11-02-interaction-design.md
first attempt to adapt code
Merge branch 'gh-pages' of github.com:dilettant/thepublicoffice into gh-pages
fix AMC to round up if it's a fraction
sem add
Update last grabbed time also for failed channels. So TvServer isn't looping through them all the time.
added new recording option. Only newer Episodes.
disable avstream detection for http. This is just an ugly hack to prevent MP to start mediaplayer for all AV stuff. No idea why it does this at all.
- added disaster edition patch - to make this version visible in every log and screen to MP Devs (to say: hey your don't get support for this freaky version)
add delayed refreshrate changer / late ftp detection
PowerScheduler: only log share message every 60s
PowerScheduler: let PowerScheduler run every 10s instead of an endless loop
TvEngine / Recordings: apply RecordingConflictsOptimization patch. Makes MP Recording Section a lot faster!
TvEngine / SetupTV: show only visible channels in drop down box
TVEngine / TVPlugin: support external thumb generation utilities (thumbs in the same path as ts are supported)
TVEngine / TvPlugin: let the TVGuide ask again for playing running recordings
i like my two top level build scripts
Enable browsing yesterday's EPG data
fixed programinfo
gplayer does not need to query mediainfo on play with delayed refreshratechanger
TvEngine: let the tvserver do a retune / PMT research if recording or livetv buffer does not increase (thx morpheus)
Update unit1/datatypes2.c
Added new Jdialog for inserting new invoices. Just started, main problem, regarding inserting rows into Jtable has been figured out.
Added invoices Jtable list on Invoices tab.
Вектор то точно синхронизирован!
Merge pull request #373 from FrolovNikolay/master

Task 06. StringFormatter 1.2.
fixed range of the array radial()
number of shells is different for different sectors
some smoothing of the data applied to keep the multidimentional array consistent
improved menu enabling
new version 1.2
Updated link to 1.2 build
Fixed a line length issue.
Updated a few comments.
Added the --bayimg argument.
Update Gemfile and added development environment with shotgun. Removed gem versions.
Cleanup of alter egos
Added support for Arduino IDE 1.0, improved debugging system, added patched Adb library
Individual permission checking added
Changed TODO to .rst file.
runaway allocation
docs: directory tip
docs: matrix benchmarking from template
Update .cabal to make "cabal sdist" happy
Use minified CSS.
Going to 1.8.6
修改部分语句的翻译
Renamed Set command to Create.
Added "set" command for setting properties.
Added Restock and Disable command.
Switched to InventoryHolder in order to support more than just chests.
Partial restock handling.
Fixed all the filters in FilterManager and FilterViewController.
Replace star-icon. Fixed a bug with the predicate in FilterManager.
a start on spheres with spin
Added procedures to write index and DaveRank to .csv files
Add clarifications to :disabled and :enabled selectors
General view for production stock
Makes emission line
Adding Zombies
Initial commit
JavaScript example
Added readme
Added runner
Update javascript/README.md
Merge branch 'master' of https://github.com/ejboy/scriptella-examples

Conflicts:
	javascript/README.md
Added libraries to allow executing with Maven
Merge branch 'master' of https://github.com/ejboy/scriptella-examples
separated out macbook stuff into just dotaquamacs
updating parkinglocationList with the parking location list
Merge branch 'master' of github.com:electricflux/sdapp_client
updating android.xml
Removed #include from utilities
Implemented Mail Chimp Newsletter form

+ Added form for MailChimp, still need to do some configuration on their
side I believe.
+- Tweaking functionality and styles for cross-browser compatibility
- Cleaned up view code a bit, more to come
Último commit para el merge del 2º Sprint.
Se sube el Ferrari, con las físicas corregidas.
no summary available
no summary available
Rollback to 2012-11-14 14:00 UTC
Reply to Jonas.
no summary available
Update a link here.
use imperative form in first line of doc-string
Fixed tests failures due to changes to copy-to-register
Merge pull request #73 from gvol/master

Fix copy-to-register in new emacs (bug #68)
Get rid of some from 'cl
Merge pull request #75 from gvol/master

Remove some from 'cl
Add console.log snippet for js2-mode
wee
wewee
se
siii ya casi esta :D
With Like working ok
trying to monkey patch _init, _sync and added functions instead of re-writing them all
Added code to track and disconnect global signals - hopefully this gets past review.
Merge branch 'gnome3.4-monkeypatch-branch' of github.com:mathematicalcoffee/StatusTitleBar
Revert "Merge branch 'gnome3.4-monkeypatch-branch' of github.com:mathematicalcoffee/StatusTitleBar"
It shouldn't have been merged.

This reverts commit 2760d157c31ea3a0407d49d35da7f49997d72cd7, reversing
changes made to 8f18d8e1d71c4d8f022a7ea011f8847b341dca82.
track all signals so that we can disconnect upon destroy
Tested on gnome 3.4: misc. bugfixes. works.
updated by mathematicalcoffee, it properly connects/disconnects signals now
Added custom login/logout
added cucumber feature files

display_contact, filter_contacts, people_search.feature
added search by first, last, and full names functionality

admin can type any of the above into search box without selecting the
field type
adding in test for thermometer
(#13610) Add function_available to stdlib

This function provides a simple wrapper around
Puppet::Parser::Functions.function for access within Puppet manifests.
This will allow users to check whether or not a plugin or functionality
such as hiera is installed on the server.
Updated teacher's examples
Added blue sky image
Fixed bug when checking if it's a new object saved in save_revision.
dream opt support added
.gitignore fix
Merge branch 'cl_opt'
Use gesture recognizer instead of hit test for touch detection
HTCQualcommRIL: Set mUSIM and mSetPreferredNetworkType

This is required to enable "GSM/WCDMA/LTE auto" mode on evita, and to make the device load that setting after reboot.

Change-Id: Iec563669f50724e7726b0c0e23f62910442cac76
base: genlock: Use a signed long for the result from wait_timeout
arm: Allow saving of stacktraces from other processes

Currently, a process is only able to save its own stacktrace
due to concerns about other processes going away while the
saving is occuring. Realistaically though, hititng this
case is very unlikely and the debugging benefit outweighs
the risk. Enable saving of other stacktraces for access
through systems such as procfs.

Change-Id: I584388f6edb48431bfec8d11d217f0fdc116f73e
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
USB: f_mtp: Remove existing duplicate code

autoconfig of out endpoint is being done twice for mtp driver.
Hence, removing the duplicate code of autoconfig of out endpoint.

CRs-Fixed: 339985
Change-Id: I677462999d0bcc1387aafe4c068e09fda5df15f6
Signed-off-by: Chiranjeevi Velempati <cvelempa@codeaurora.org>
(cherry picked from commit 5e27b7675695c82b8fd61565950863567e5c0628)
ASoC: core: Fix the suspend/resume failure

The suspend/resume schedule work fails because of the
uninsantiated sound card. The fix is to skip the
schedule work for the uninsantiated sound card.

CRs-fixed: 339411
Signed-off-by: Kuirong Wang <kuirongw@codeaurora.org>
(cherry picked from commit 5ab054fb0655bb0ab6820a18e931fabf69053ea9)

Change-Id: Icf303ffef9d7019c936510dc676ba83eeec84f1c
Signed-off-by: Zhoulu Luo <zluo@codeaurora.org>
mm: Avoid livelocking of WB_SYNC_ALL writeback (bananacakes)
add staff and test codes.
added comment to Map.cpp
first
Merge branch 'master' of https://github.com/faceyspacey/special-stuff
a remove
optimized stuff. Added settings(Not working yet). ListView refresh still not working.
add script.js
add script.js
Merge branch 'master' of https://github.com/fake-or-dead/presentation

Conflicts:
	index.php
Now disconnects properly
plot: fix the pipe
Rename ValidationReport to ValidationContext

This class has multiple responsibilities right now. Split them first by
renaming it to a more appropriate name.
JsonPointer: add "copy constructor"

Take advantage of this opportunity to define a static final root pointer in
ValidationContext. This avoids having to throw a RuntimeException in its default
constructor.
Reintroduce ValidationReport

This means ValidationContext can now delegate all message additions etc to this
class.
Make JsonSchema an interface, not an abstract class

And rename the ex JsonSchema to AbstractJsonSchema, which implementations is
horrible in any case.
Rename *Schema to *Validator

It suits their role better. We want a Schema to be a wrapper over a JSON
document in the end.
AbstractJsonValidator: remove abstract method

It is defined by the interface.
Move SyntaxValidator to another package
Move some other classes around
Create validator package, move some classes in it
Remove all references to AbstractJsonValidator.fromNode()

This method is going to become obsolete.

This means, though, that we don't have a performance test anymore, nor the test
for issue #7.
New JsonValidatorFactory and SimpleJsonValidator classes

The JsonValidatorFactory uses Guava's LoadingCache and a CacheLoader.

It is intended to be used _after_ $ref is resolved etc.
SchemaRegistry: don't break if an "id"-less schema is "registered"

The .register() method returns a SchemaContainer, but containers with an empty
locator are also allowed.

Return such a container in this situation instead of complaining that no id was
found.
New JsonSchema implementation, with associated Factory

This is essentially a wrapper over JsonValidator, with $ref resolution and
which, more importantly, is context aware.

Change ValidationContext to introduce two new fields which will be used to carry
this context between validators.
InvalidJsonValidator: make it implement JsonValidarot directly

There was no reason for it to extend AbstractJsonValidator anymore.
Remove tests for issue #7 and perf test for now

A redesign is in the pipe, which means these tests will need to be modified.
Completely redesign the way problematic keywords generate new schemas

Introduce two fields in ValidationContext: a JsonSchemaFactory and a
SchemaContainer. This allows it to transfer the necessary pieces to validators
which need them, which are the 4 usual suspects (type, disallow, extends,
dependencies).

Also get rid of now unneeded classes in the process.
Fix issue #7, reintroduce performance test

With all these changes, the context is now properly transferred, which means
"extends" actually works.
(+) CSS-костыль для IE8
(f) Неправильный перенос длинных слов
added error message to application helper
add resource server
Clarify README with fielded Solr queries.
imce, imce_wysiwyg, wysiwyg, TinyMCE, drush .make and README
Update README.md

Updated the README.md to describe what I'll be using this project for.
Item11808: reverting perltidy



git-svn-id: http://svn.foswiki.org/trunk/SetVariablePlugin@14747 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Item11808: perltidy them all, so people are not accidentally impacted by the new enforced rule -- Sorry Micha, could not find a way to define specific values within the file

git-svn-id: http://svn.foswiki.org/trunk/SetVariablePlugin@14686 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Add automatic rvm installation
Add: .gemrc config files
Fix: bash var error
Add SSL in production
finished chapter 7 exercises
battleManager
Merge branch 'master' of github.com:fredericky/45eb9e92911a4f
switch to Sub::Exporter::Progressive for ::Util
switch named tests to subtests
some pod fixups
Add order_by_visitor ::Util
v2.015000

       - Add order_by_visitor ::Util
added quick start codes
parallel patch to add support for has_one and has_many relationships
Added changes to serialization
Auto Updating keystone submodule
Auto Updating glance submodule
Auto Updating kong submodule
Auto Updating exerstack submodule
Auto Updating nova submodule
Auto Updating kong submodule
adding developer_mode toggle to example.json, and added it to the Readme
Merge pull request #161 from galstrom21/sprint

adding developer_mode toggle to example.json, and added it to the Readme
Auto Updating glance submodule
true/false need to not be strings
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Auto Updating swift submodule
Merge branch 'sprint' of https://github.com/rcbops/chef-cookbooks into sprint
Auto Updating nova submodule
Auto Updating exerstack submodule
Merge pull request #162 from galstrom21/sprint

true/false needs to not be a string
Auto Updating keystone submodule
Auto Updating nova submodule
Auto Updating swift submodule
Auto Updating mysql submodule
A few layout changes
Merged some layouts
shell_script: factored out function library
Merge branch 'master' of github.com:garethstockwell/templater
add new header files and add lpq codes
added www subdomain
rollback
added www subdomain
Added sensors and actuators implementation for arduino

Jira issue: WP-595
Set up virtualenv
Rehauling site to a virtualenv and changing to flask instead of app engine
Restructured to flask. Majority of frontend work complete. Need to implement backend.
Most of the front-end is ready.
Retooling spider
Start adding identifier category configuration code
status set, stage 1/2
Renamed MongoDB server tag
Bugfixed Update of the SQL persistence
extractor: check if command is target only when a command option is specified
aenlav?>,s;ldvm
Update to flexmock 1.0 which fixes Delegate issues
updated circuit board
cleaned up firmware
Updated makefile to reference firmware.c
Merge branch 'master' of github.com:hackrockcity/domeFirmware
Ensure that job state will be saved if task throws an exception
Move generator to sepperate class + move helper classes to sepperate
package
make the root log4j logger log at level ERROR to stdout
re-add setup.py to appease mr.developer
HHU logo
VCL Log Displayer created
Added support for specifying the database name for table in a SELECT statement. Closes #36.
Disabled parentheses for SQLFunctionExpression when no parameters. Closes #35.
Removed all dependencies of Chrome. Only GoogleSoftwareUpdate.bundle is needed for Keystone control.

modified:   chrome-disable-autoupdates.py
like + share
Added return value for normalize_nan
Merge branch 'master' of https://github.com/hotloo/oohack-competition
some editing, still segmentation fault
Add encoding hint to all Ruby files.
Add some translations to de locale.
Renamed german locale to de.yml.
Update users_controller with work from Hozr and Bookyt.
Update users views to use current conventions as used in CyDoc, Hozr, Bookyt.
Bump to 0.3.0
从Google Code项目导入
page 138
Added support for Bowtie2 in Tools
Math is a bit off (test)
Removed option to disable display of incoming ships. Attempt to reduce resource errors.
Updated version and changes.txt
People have poor email reading skills.
Merge pull request #49 from lemming552/develop

People have poor email reading skills.
Fixed Stockpile downgrade and demolish checks.
Merge pull request #50 from lemming552/develop

Fixed Stockpile downgrade and demolish checks.
Slightly clearer text.
Fixed BHG related supply chain.
Merge pull request #51 from lemming552/develop

Develop
summarize_server.pl taken out of run_hourly.sh
Merge pull request #52 from lemming552/develop

summarize_server.pl taken out of run_hourly.sh
Merge commit '490e253c08410ad41f618ef09419d1e0f5b9caf2' into develop
Allow assigning a spy that hasn't been ticked yet
Merge pull request #54 from ysth/develop

Allow assigning a spy that hasn't been ticked yet
Some checks.
Merge pull request #57 from lemming552/develop

Some checks.
Merge branch 'master' of github.com:plainblack/Lacuna-Server-Open
a new branch

Signed-off-by: nishidream <492099529@qq.com>
register.php modified and finished

Signed-off-by: yyz139 <yyz139@gmail.com>
Merge remote-tracking branch 'remotes/origin/nishidream' into yyz139
modified:   app/admin/dashboards.rb
	modified:   test/dummy/features/event_registration.feature
amke test fail
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/com/thoughtworks/twu/controller/HomeControllerTest.java
hoge
hage
Merge branch 'branch_B'

Conflicts:
	src/oit/iloop/kiosk/test/MainApplicationClass.java
hogehoge
hage
Merge branch 'branch_B' into branch_test_master

Conflicts:
	src/oit/iloop/kiosk/test/MainApplicationClass.java
#9/19 Add SubjectData.java KioskSeverAdapter.java TestClass.java
@actor nakamura
Changes setting import in storage.py
Merge branch 'feature/temp_urls'
commented guff out
残タスク記録
ignore phpstorm files and built archives
Switched off useDev to upload the .apk
Fixed merge conflicts
Fixed Orientation Manager
Merge pull request #235 from stowellm/ms224

Fixed Orientation Manager
cmake for handling pc file
Add count 771
Add count 1003
Add count 941
Add count 168
Add count 1051
Adds a new module for configuration preferences. Draws arrows with arrow heads.
Sync'er Bugfix  and prep stmt
Various CSS & HTML structural updates
move asana api key to file that isn't under version control
dummy commit to test asana #921760015088
Continue running after http errors.
Translate categories
Remove debug statement
Kleine grafische Feinheiten :)
Photo Verification

Testing on PhoneGap Didnt Break it on Browser
Rename verify callback to validate.
Supply user instance in secret callback.
Test that nonces are passed correctly to validate callback.
Reorder test cases.
Remove username from arguments to validate callback.
Update example to reflect new calling conventions.
Update documentation.
Make validate callback optional.
Update README to detail new DigestStrategy callback signatures.
Add worker to build
New project on linux
New project on linux
Settings file that seem to work with Django 1.4
Added the removal of escape character backslashes from name processing
Started using Data.Char for number testing
Moved a number of article format parsing functions to a separate file
Changed substitute/rename to use sets instead of lists
Added functions to find type variables in terms and types
Added a standard reference for a bool type
Fixed a number of compilation errors
Fixed bug in mkEqualsType
Fixed bugs in alphaEquiv, substitute
Added guards for command functions
add images to war
fiddled with Readme again
[maven-release-plugin] prepare release findbugs-4.42
Added entry deciders.
sched: Fix nohz load accounting -- again!

commit c308b56b5398779cd3da0f62ab26b0453494c3d4 upstream.
[ backported to 3.0 by Kerin Millar <kerframil@gmail.com>]

Various people reported nohz load tracking still being wrecked, but Doug
spotted the actual problem. We fold the nohz remainder in too soon,
causing us to loose samples and under-account.

So instead of playing catch-up up-front, always do a single load-fold
with whatever state we encounter and only then fold the nohz remainder
and play catch-up.

Reported-by: Doug Smythies <dsmythies@telus.net>
Reported-by: LesÅ=82aw Kope=C4=87 <leslaw.kopec@nasza-klasa.pl>
Reported-by: Aman Gupta <aman@tmm1.net>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-4v31etnhgg9kwd6ocgx3rxl8@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Kerin Millar <kerframil@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
PM / Hibernate: Enable usermodehelpers in hibernate() error path

commit 05b4877f6a4f1ba4952d1222213d262bf8c132b7 upstream.

If create_basic_memory_bitmaps() fails, usermodehelpers are not re-enabled
before returning. Fix this. And while at it, reword the goto labels so that
they look more meaningful.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reach deeper C idle states faster. From imoseyon.
driver: fix and consolidate lte code after vision-2.6.35-gb-MR merge

Conflicts:

	arch/arm/configs/cayniarb_msm7230_defconfig
	arch/arm/configs/cayniarb_speedy_defconfig
	arch/arm/configs/cayniarb_vivo_defconfig
	arch/arm/configs/cayniarb_vivow_defconfig
	arch/arm/mach-msm/include/mach/7x30-lte/msm_otg.h
htc: lte: updated driver

Conflicts:

	arch/arm/mach-msm/lte/rpcrouter_sdio_xprt.c
	arch/arm/mach-msm/lte/sdio_al.c
	arch/arm/mach-msm/lte/sdio_ctl.c
	arch/arm/mach-msm/lte/sdio_diag.c
	drivers/char/diag/diagfwd.h
Added project dossier + serial dll

Signed-off-by: Jesse Dobbelaere <jesse@dobbelaere-ae.be>
Pausing works.
Rework

Rework Cell and Grid class. Rework as well main.

Signed-off-by: Jean-Marie Lemetayer <jean-mariex.lemetayer@intel.com>
Adding All, and #all to DynamicCollection, DynamicList, and DynamicArrayList
Deploy db install/uninstall scripts
Removed parameters from hubot config
First render in iOS
ios
`more
Beginning conversion to a Yii Rights compatible user module.
erst einmal fertig
Initial commit.
Created module to hold keys and connection information.
Mejorando el layout del admin
updated instructions x 3
Add a note about TOKEN_CHECK_ACTIVE_USER in the README
Make sqlite compatible.

Since mysql wasn't easily accessible on the test machine, modify the
storage to use sqlite.
Adding nuspec to solution
Didn't work... reverting.
Added 'test' Grunt task.
Added 'scripts/test' directive that runs Grunt 'test' task.
Initial Travis CI build configuration.
.
Added VIM ignore.
Actualización desc
BUG 8806 "Quiebre de linea en el label 'Retornar a la lista..." SOLVED

- Need to increase width of <td class="tableOption"> holding "New" for
  longer translations
- Increased width for the tag 'td'
Merge pull request #115 from julceslauhub/2.0-testing

BUG 9285 A PM Table DynaForm field cant' be filled beacuse the ... SOLVED
Merge pull request #113 from victorsl/2.0-testing

BUG 8806 "Quiebre de linea en el label 'Retornar a la lista..." SOLVED
BUG 8550 testing 11 asignacion de usuarios en las tareas por mediO... SOLVED

- We verified that in searches reappears previous value.
- Was modified the class.propelTable for not to show the parameter in the following search.
Merge pull request #120 from marcoAntonioNina/2.0-testing

BUG 8550 testing 11 asignacion de usuarios en las tareas por mediO... SOLVED
BUG 9210 User experience Single Application SOLVED

- We verified that the list of the steps not working.
- Was modified the class.appCacheView, the function getTodo for parameters include TAS_UID y PRO_UID, too was modified the template indexSingle.html, too translation.
Merge pull request #121 from marcoAntonioNina/2.0-testing

BUG 9210 User experience Single Application SOLVED
BUG 8899 En Experience User en el deslogueo se direcciona... SOLVED

- Not checked with the default skin.
- was modified the class.g to verify skin from the configuration.
Merge pull request #123 from marcoAntonioNina/2.0-testing

BUG 8899 En Experience User en el deslogueo se direcciona... SOLVED
BUG 9180 Fixes made by Herbert

- Error in date interval search, the second date in the interval was not used.
- Error unserializing APP_DATA with null value
added a gazillion of new examples :)
added est's examples (except the normality one)
added untracked files
change LogType from a pseudo-enum to a String alias
login method modified
Resumes playing on resume if playing before onPause.
Refactored parameter form (indexed parameter fields)
Merge branch 'class_parameters' of
git@github.com:kbrezina/puppet-dashboard.git into class_parameters

Conflicts:
	app/controllers/node_group_class_memberships_controller.rb
ajout du check de la syntax par la fonction check_syntax_error
Catch Edurep query errors.
add door page. and change redirect path before sign in
Fixed spelling mistake, cleaned up mc_update() for Craftbukkit
* Added comments
* Added pic() method
Renamed objectInitialize() to picObjectInit()
Initial Entry
* Fix to use label attribute instead of name.
* Added comments.
* Fixed handling of rendering sync or async.
* Fixed implementation of oconstraint()
* Numerous bug fixes based on implementation of example diagrams.
* Relayout comment
* Added connectToComment() call
Tuned page size.
* Added exampleDiagrams directive to build example diagrams.
Initial Entry
Added tests directory to clean directive.
Bump up version.
first edit

Made first edit to test GIT
Pull in latest openstack-common changes and fix a minor PEP8 issue.

Latest openstack-common commit: d887090b5a31672e4a12f302b3818e2b0933bef0

Change-Id: I5a4ffb043ab24f8618a8285112c0c5992ea129e7
Merge "Pull in latest openstack-common changes and fix a minor PEP8 issue."
Change port to 6076
modify movepage
bugs fixed in code generation
refactoring virtual machine with OPDEFINE
teribble mistake ?
teribble mistake ???
abondon USE_THREADED_CODE
merged conflicts
Interface for data store.
Multitype Fix
Merge pull request #28 from TheImmortal/patch-1

Multitype Fix
Merge remote-tracking branch 'upstream/master' into fixes2
Convert the merge to the new bracing style
Web_TreeViewInitializator VERSION_UPGRADE 0.5.1.0
- Added some new symbols
- Added new symbols into the Tree
content portlest eingebunden
исправлен баг при конфертации PB-Name → Java Name
add travis support status
engine done, filter done except for changing
Removing tourstats help
Pass Winner, Sanitizing

-Pass Winner (can pass starting rights to other players)
-Answers Limit
-Sanitizing Strings
Merge pull request #161 from IceKirby/patch-5

Some stuff
make metronome seeds random
Syntax :x
sound voor orientonwhiteline
if the bower resource is a file, strip any .js extension, since
requirejs wants to append that to the path.
Amend for menu breadcrumb.
Forgot to add json dump kwargs
输出tinyliuqid对象，修改注释信息
grafica commenti proposte e bordo più chiaro proposta
add options to attr_writer
Merge pull request #32 from wyaeld/master

Add options to attr_writer
Cho phép tùy biến _HomeLayout
Cho phép tùy biến được leftCol và rightCol thông qua 2 thuộc tính của ViewBag:
ViewBag.hasLeftCol và ViewBag.hasRightCol

Signed-off-by: Tien Nguyen <lilylnx@gmail.com>
Merge remote-tracking branch 'origin/for-tien' into maint

* origin/for-tien:
  Cho phép tùy biến _HomeLayout Cho phép tùy biến được leftCol và rightCol thông qua 2 thuộc tính của ViewBag: ViewBag.hasLeftCol và ViewBag.hasRightCol
Simplify several properties within NSFReader.cs

Removed stuff such as 1 index byte arrays (lol, I don't even know why I did this) and replaced it with a simple byte.
更新njit8021xclient源码包到1.2版本
Make ItemDetail page almost work
Now removes duplicate legend items (uses nens-graph 0.10).
Update image map, move hover now works
Adicionado modulo de taxas
Adicionado basico para modulo de taxas
Loan, payment and error templates implemented
Luke: added ingestion_manager process
Fix mass assignment Rails 3.2 bug for Authorization
Support JSON parsing in Router#request_from
Use newbies with their own data source
Makefile: change a couple of hard-coded gcc to $(CC).
testpara-native test target added
Debug output from check_inflate_CODE2()
OpenCL implementation of GPG format
Fix (hopefully) compilation problem on Snow Leopard.
common-opencl.c: Add -cl-nv-verbose if device is nvidia
Include a vectorized kernel in same file as non-vectorized. It is not used yet.
Add an opencl-rar.h file.
Merge branch 'magnum-jumbo' into bleeding-jumbo
IPs database update to version 1.161
IPs database update to version 1.124
parent details for new child
Rails Framework started
2.7.27

..
+ added a .bat file to compile multiple .less wihtin a folder.
hot keyword on Top
remove search layouts
Merge pull request #76 from shma/master

Topにホットキーワード表示
got it.
Use field_index

Instead of using own inefficient function, use ncurses'
field_index. Improved field navigation.
Added code to coordinate system
Added easy access method
Suporte a expressoes como comandos, e interpretador interativo simples para demonstraçao na aula.
Merge branch 'master' of github.com:marcelemaschka/Paradigmas
Adicionando helper para a rota omniauth_authorize apontar
para o subdominio principal.
Corrigindo rotas dos canais e do devise
Alterando a sessão para funcionar em subdominios
Corrigindo método edit e url ao redirecionar após criar ou
atualizar um canal.
24mm hole for big speaker added...
Merged Jquery to core.js
New Weerkaart
gitignore
Generic stream widget
Specific 3fm widget now
typo
ons journaal add
Better config in login
Merged requests and solved widget sorting
Update readme
Updated NuGet specification
Adding build script (WIP)
tests_notes.txt
[configure] bump GTK version to 2.24.0
[build] Update all Makefile.am to more recent standards

http://git.gnome.org/browse/gnome-desktop/commit/?id=4c3d78c930ecb833a677f534ef6cd697d3d92169
[misc] rename --enable-deprecations to --enable-deprecation-flags

This is a better name for this configure option, since it's really about
enabling the use of the deprecation flags, not allowing the use of
deprecated API.
http://git.gnome.org/browse/gnome-desktop/commit/?id=7fcbb6d90d2c6251434dfac19364b39af21dceed
[mate-bg] Proper update for GTK3 changes, simplify GTK2 compatability

Reverts: bc53751054ab "some ugly gtk3 porting", then:
1. use upstream commit below as a reference (GTK3)
2. simplify our GTK_VERSION_CHECK's, hopefully to make the code more readable,
and the GTK2 backwards-compatibility snippets easier to cleanup later.
--
Includes a renaming of all "pixmap" names in APIs to "surface":
http://git.gnome.org/browse/gnome-desktop/commit/?id=28f2b06f50e3f1adf19389c2c3a1f63872539fa9
https://bugzilla.gnome.org/show_bug.cgi?id=630724
Remove unnecessary, deprecated, GDK_DRAWABLE cast:
http://git.gnome.org/browse/gnome-desktop/commit/?id=260f6d2431088c5cd0ad1eb8d57f0ec994240f08
[libmate-desktop] make error traps use the new GTK APIs

http://git.gnome.org/browse/gnome-desktop/commit/?id=da4d293870762064285231fba3a2a7c3c0d25838
[mate-bg] don't keep duplicates of cache width and height

http://git.gnome.org/browse/gnome-desktop/commit/?id=c5e5db705ee982e3cc0761a7c83235798d8428bd
[mate-bg] don't try to use a null format

upstream commit:
http://git.gnome.org/browse/gnome-desktop/commit/?id=9a2c931869214d5113e3c9246cc36c094bd211fe
"introduced a bug that would cause a warning to spew in gnome-screensaver"
http://git.gnome.org/browse/gnome-desktop/commit/?id=f2a6d5ea97b98ea3b1d36bb1de83f3bfc92c5c73
[rr-labeler] use the new GTK3 draw event instead of expose-event

http://git.gnome.org/browse/gnome-desktop/commit/?id=2168b182343c89e01030af9c19475a3cf5a24f5e
[rr-labeler] honor workarea so labels don't appear over/under panels

http://git.gnome.org/browse/gnome-desktop/commit/?id=053a932b09487c4fa3e6331ef7fb65d24667263d
Merge pull request #36 from jasmineaura/develop

Properly support GTK3, simplify GTK2 compat, and some fixes
Reverted commit removing last ionic step
Offset fixes.

Signed-off-by: Matt Benjamin <matt@linuxbox.com>
Added gitignore
Merge pull request #1 from tomkrush/master

Added gitignore.
Added getchar() to wait for user input for debugging
Add goban cloning.
Formatting stuff.
Rename Block.generateFrom() in getBlockCovering(), because more explicit.
Add equality between similar blocks.
Add block clones.
Add a method to get all the blocks covering some coords.
Replace inner row/col by coord + add a coord-based constructor.
Make the cloning method public.
Add a method to know if a coord is out of the goban.
Add a method to compare gobans.
Add setters to select the next player.
Minor refinement.
Create specific exception for moves on not free places.
Implement a determined player (strictly following a list of moves).
Replace inner player class by existing ones.
Manage suicides (forcing player to lose stones).
Minor refactoring & attributions
Pequeno ajuste que corrigiu a alternancia quando a troca da mao
big update
update old files
Library v.1.0.2, Component release v.17.0.3.1
close #8 authentication is working
Changed Thank You Message
Possible prime list
Updates for BCSD files and initial attempts of scsidevs support.
Some fixes. Add turn-on-fci-mode to java-mode-hook.
Made the download file directory a configuration option
mm: adjust vm ratios
Makefile: Added Snapdragon optimizations
include: mm: increase readahead buffer
Updating README.
Updating .gitignore to ignore doc folder.
Updating documentation CSS.
Adding legacy API#send_message and new SMS::Response object.
Bug 89724 - SUPA screenshot upload support for MediaWiki
Bug 89724 - Suhosin notice
Bug 89724 - Determine maximum upload size correctly
Bug 93182 - Update extensions for 1.18
Bug 93441 - Change extension to png on SUPA upload
Bug 84994 - E_STRICT
Bug 110262 - Add packed200 SUPA for newer java
Bug 110262 - Bump version
Started the directory lookup
Progress, but something is weird and soup won't read the html
Ok, extractor works. Pulls from a directory, writes to single file
changed gentoo and added pf kernel
Refactor unix_user model to create gear TA1975

Move .state file to OPENSHIFT_GEAR_DIR
For US2109, fixup usage of repo and logs in cartridges.
Breakout HTTP configuration/proxy

Only remove existing httpd conf in UnixUser model
Changed gear to string app
Typeless gears - create app/ dir, rollback logs, manage repo, data and state.
Merge branch 'master' into US2109

Conflicts:
	cartridges/mongodb-2.0/info/hooks/configure
	stickshift/abstract/abstract/info/lib/util
	stickshift/node/lib/stickshift-node/model/unix_user.rb
Updated documentation after refactor. Corrected merge
Updated code to meet coding standards
Change to use cartridge instance dir in lieu of app_dir and correct use
of app and $gear-name directories.
Don't create gear dir (symlink for short term to the 'framework')
and don't set the gear ctl script in unix user.
Bug fixes to get app creation working.
set uid:gid for user owned git repo
Add and use cartridge instance specific functions.
Merge branch 'master' into US2109

Conflicts:
	cartridges/nodejs-0.6/info/bin/app_ctl.sh
	stickshift/abstract/abstract/info/lib/util
Fixes for jenkins cartridge

Updated lib/util#secure_app_dir to include new app/* directories
SELinux security context required after chown directories
Refactored ci_build.sh to use OPENSHIFT_REPO_DIR
Bug fix - correct app/ directory permissions.
Fix up cuke tests for first round of typeless gear changes.
Bugz806935. Print application deletion message even if cartridges return information.
Removing redundant application destruction message from jenkins cartridge
Fixing bugs related to user hooks.
Updating gem versions
Modified class to decode the whole object instead of event's source.
Encoding is done for whole object instead of events source alone.
Removed bytearraystreamdecoder and renamed frameSize to maxFrameSize
Added dependency on blazeds common jar.
Modifications for AMF3StringProtocol
Unit test for AMF3 string protocol encoding and decoding.
Adding blazeds common jar which is required for AMF3 serialization and
de-serialization.
working on graphing fuctions
expense adding mysql
ADD: Added table for graph comparison in chapter 04
Set the name of a new game. Added web site.
BUG: Fixing patient name and linking to result items on the detail view.
Included compatibility for Flot 1.1
storyboard 3
Merge remote-tracking branch 'origin/master'
利用程式寫出近期活動和附近景點Table，並置入一些活動、景點當例子
Merge remote-tracking branch 'origin/master'
fixed issues for linearized pdf and xrefstremed pdf
updated readme
Don't leak a file descriptor in the bson_ext gemspec
Merge pull request #127 from ebroder/bundler-git-fixups

Don't leak a file descriptor in the bson_ext gemspec
@version: 1.2
Loaded highscores are now HTML escaped.
Twitter feed update
Snorre initial work
add 2 new searth tests for mobile
pep8
Merge pull request #122 from bebef1987/mobile_search_2

Mobile search 2
Test for pivotal #33702407
Fixed string splitting
Added check for Breadcrumbs
Fixed assertions
Merge pull request #97 from sashakruglov/pivotal_33702407

Pivotal 33702407
adding homepage html and js, fixed scrolling together article and ref.
Updated method name in NSString+CCF.
Added header for importing all categories at once.
Added getters to room, ward, bed
Add getter for all wards
Add missing return statement to wards getter
Resolved conflicts
jquerty
add menu class
add my interface
add my interface
Fix bug when trying to close inner part of a nested environment
Adjust build script to ignore errors setting stationery bit
Wrote a buch, added references, added figures, etc.
merged changes
Backup Solr index.

Create a new CloudCrowd action to snapshot the Solr index, tar/gzip it and store it on S3.

I've been unable to find out if the /solr/replication?command=backup http command:
  * Returns immediately, and you then need to repeatedly request status to determine if it's done
  * Or whether it waits until the snapshot is completed to return the response.
On my system with a very small index, it returns immediately and then status says its completed.  We'll have to run some tests on the larger search index to determine which method we need to accommodate.
# Fixed SA errors
Fix memory leak where removing an NPC did not remove its circuits.

This was because we were removing by circuitcode where NPCs have no code.
Now removing by agent ID instead.
This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
Downgrade libopenjpeg back to 1.3 from 1.5.

This is because libopenjpeg 1.5 appears to require a minimum of glibc 2.14, whereas at least one fairly recent distro (openSUSE 11.4 from 2011-03-10) only has glibc
Further investigation pending.
Extend attachment regression test to check for appropriate attach event firing.

This reveals that the event is not being fired when an object is attached from ground, which is incorrect.
This check is temporairly disabled.
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Adds support to ScriptModuleComms for region modules to export
constants to the script engine.
minor: Convert ad-hoc list building in ObjectCommandsModule to use ConsoleDisplayList
Don't eagerly clear frame collision events when physics actors subscribe and unsubscribe from collisions, in order to avoid a race condition.

Since this is done directly from ScenePresence, it can lead to a race condition with the simulator loop.
There's no real point doing it anyway since the clear will be done very shortly afterwards by the simulate loop and either there are no events (for a new avatar) or events don't matter (for a departing avatar).
This matches existing behaviour in OdePrim
quick tweak to footer
Anpassung der Schriftgröße in der Übersicht am oberen Bildrand, damit
diese besser zu lesen ist.
stop initializing audio
first commit
Merge branch 'master' of github.com:netoarmando/info-schedule
convert engine into railtie
Merge pull request #18 from phlipper/railtie

convert engine into railtie
adding cv
removing assets
CalendarEntry
SAKIII-5678 Attaching event to container instead of window
https://jira.sakaiproject.org/browse/SAKIII-5678
Merge pull request #2141 from apex13/SAKIII-5678

SAKIII-5678 - Create+Add/Add collection does not work in Internet Explorer

* apex13/SAKIII-5678:
  SAKIII-5678 Attaching event to container instead of window https://jira.sakaiproject.org/browse/SAKIII-5678
Merge branch 'master' of github.com:sakaiproject/3akai-ux

* 'master' of github.com:sakaiproject/3akai-ux:
  SAKIII-5678 Attaching event to container instead of window
[SAKIII-6178] Adjust the header size hierarchy to reflect the header level
SAKIII-5548 - Fix display issue in content permissions
https://jira.sakaiproject.org/browse/SAKIII-5548
SAKIII-5550 Right side padding is absent from thumbnail picture element on contacts page
SAKIII-5549 - incorporate editors into content profile
https://jira.sakaiproject.org/browse/SAKIII-5549
Merge pull request #2041 from bp323/SAKIII-5550

SAKIII-5550 Right side padding is absent from thumbnail picture element on contacts page

* bp323/SAKIII-5550:
  SAKIII-5550 Right side padding is absent from thumbnail picture element on contacts page
Merge pull request #2040 from christianv/SAKIII-5548

SAKIII-5548 - Fix display issue in content permissions
Merge pull request #2042 from christianv/SAKIII-5549

SAKIII-5549 - incorporate editors into content profile
SAKIII-5551 enable save content button for mylibrary when user cant share item
Initial README checkin.
Move login.jinja2 into home.jinja2. Add "if" statement to display
list_article if already logged in.
This is the first demo commit! Git is awesome!
Conflict resolved!
Merge branch 'master' of
https://github.com/nkaviani/git_stockwatcher.git

Conflicts:
	StockWatcher/.gwt/.gwt-log
3-11-12 (2)
============
Changes synced in all the right places

-Small change to layout on main/index.php and main/view_headlines.php
Merge pull request #38 from alexoulapour/master

3-11-12 (2)
[test] Run core tests on `npm test`
[test] Stop testing on `node v0.9`, tests timeout
Initial release Commits
Fix incompatibility with Ruby 1.9

In Ruby 1.9, Array#to_s has a different behavior than Ruby 1.8.7

It is preferable to use Array#join to combine the items of an array into a string as in Ruby 1.9 Array#to_s is a shortcut to Array#inspect
logging schaut better aus
actually test delete_cookie, and add failing spec for symbol arg #8
NXP-10665: follow changes on TaskProvider interface
from now on picks will be shown from today only
added seperator between names
fix stuff w/ dice.. thanks mule
BOA: Delete old ltd shell tmp files automatically (Robert)
BOA: Better permissions (Robert)
BOA: Fix for inconsistent d.o packaging (Robert)
Open Atrium 1.6.1
Add auto-healing support for Bind9.
* added deployment information to the Sonatype OSS repository
Some work on the UserController, and a temporary fix for now. #17
Fixed division by zero. #18
Tests for #18
Fix for #51.
Merge branch 'master' of github.com:onepercentclub/bluebottle
Fix for ARC runtime error with bad access objc_retain.
Expose deviceId for reviewers
Converted hex values to integers and floats, added to particle.  Particle only has 20 light channels right now.
Merge remote-tracking branch 'upstream/master'
Merge pull request #20 from deverett/master

ISUSv3 Driver Incremental Development
Re-enabled Anterior Sement element