labofsahil/github-event-dataset-2012 huggingface dataset:
Improve googleput visual feedback (last commit was for googleget)
first attempt at demo page
dri2: turn vblank error into a WARNING
xrandr rotation (v3)

If XF86_CRTC_VERSION >= 4, on platforms with dmm/tiler (OMAP4+),
use tiled buffers for scanout buffer to enable rotatated and/or
mirrored scanout.

This utilizes the RFC crtc/plane properties support to configure
rotation.  Tiled buffers are only used if rotation is enabled.

v3:
fix build with older xserver
drmmode: trigger redraw when reallocating
Added a markdown link version of the pastebot script
Updated readme about two versions of Pastebot bookmarklet
Implemented a string navigator class.
added cosetting for 17 days
First go at CKEditor for OS X
remove old upload/lazaret
add lazaret patch
Merge pull request #114 from nlegoff/clean

remove old upload/lazaret
Merge pull request #115 from romainneutron/Cache

Cache
fix upload bug && display lazaret check message && use text-overflow:ellipsis to avoid overflow
put record id in hidden input instead of id dom element
Merge pull request #116 from nlegoff/fix_upload

Fix upload
Add debug infos
Fix subdef creation
Merge pull request #117 from romainneutron/Dev

Fix beta bugs
Revert ant script
Fix Video JS display
revert display inline label in dialog box
Add new command
Revert
Fix subdef URL
Allow acces to subdefs for thumbnails
Disable tooltip on hide
Update dependencies
Add log to rebuild-missing-sibdefs command
To scala 2.10.0 RC5.
Revert "Trimmed the branch to only the messages/rosgraph_msgs sub directory"

This reverts commit fbad047355ad2652ac653f1e32c09867c21c01e2.
Rebase from 'upstream' @ version '1.9.33'
Trimmed the branch to only the messages/rosgraph_msgs sub directory
Rebase from release/rosservice
Generated debian files for quantal
Rebase from release/rosbag
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.18
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.18
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.18
Rebase from release/rosnode
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.18
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.18
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.18
Source formatting
Export SB plugin packages
Checking for Redis running added
C generated will avoid refs to virtual regs array.

- Must use 'avoidvirtregs' in tracesel to enable this.
started fixing monster attack
Merge branch 'master' of https://github.com/rvanmaren/679-Project-3-
fixed monster attack. need a cool animation. Level has both monsters created
Removed duplicate (and un-needed) logging of game-chat to console.
add states to cz real estate
add states to fr real estate
common template for re item
special cz & fr
Merge branch 'add_state_re' into develop
Adjusted MANIFESTS.in to install images
Fixed syntax
add batik to jar
Handled logout functionality.
zoom fixed, added about dialog
added opencvwrapper implementation
Site updated at 2012-04-23 14:19:57 UTC
404 controller
added static to .gitignore
Change the spreadsheet again...
Merge branch 'master' of github.com:scieloorg/SciELO-Manager into tests_overhaul
ajustes no Makefile
Merge pull request #313 from gustavofonseca/tests_overhaul

Tests overhaul
render button done
trying to ensure that comments are ordered correctly
Posts can handle annotations
Rely on tilde expansion supported since git 1.6.5.5.
Rename nbr to cb.
Add an alias www => browse-remote.
Fixed problem with null local file paths
Lcd e imagens do projeto
restored thl collab email address
Removed print statements and fixed features.
Merge branch 'master' of https://github.com/sherrywong/NERSC-Project
Merge branch 'master' of https://github.com/sherrywong/NERSC-Project
support require()
Lighten text
Added script to build arch packages
Creating a user now creates new stats for user
set default size to 500 to match makestick.sh
Update levels/verify3.sh
Add MenuItemTitle StringType Property and MenuItemIcon ChoiceType Property for SimpleMenu component.
Add specs to epgsql_connpool_config
dev and prod seperation
unique id generator
typo correction
added deal_detail
removed uuid submodule
changes to market
css changes
changed to parse API results wrapper
added category filtering
parsing results container from api
removed uneeded code
Adds sunset pictures to the story
well that didn't work, and I'm too lazy to fix it
welcome to the dog show
added parallel thing
Use mobile number for voicemail default
String:  (Phone) Sprint MWI Quirk: Phantom message wait indicator workaround
Long press back key to kill the app

Change-Id: I97c95fd269caae51b35a30830059a285f94a92cd
Adding imageData parameter to submitWithEmail; changing sample app to submit a screen shot along with the description.
Ignoring irrelevant files
Update 0.4

1. Display a table of the clients
2. When a client is selected, display a table of the client's contacts
in a table below it
a. By Default, the first client is selected
5. Each Client row should contain a "Enable/Disable" button to
enable/disable that client
a. If the client is disabled, the button should read "Enable" and vice
versa
6. Create a drop down list above the Client table the contains, "All",
"Enabled", and "Disabled"
a. By default, the "Enabled" option should be selected
b. Enabled: Display only the non-disabled Clients, the "
c. Disabled: Display only the disabled Clients
d. All: Display all of the clients
Update .5

*Fixed Add Address dialog
*Set first client to default selected
*Fixed Add Client dialog
*Fixed Update Client dialog
jbide-13012
switch master to use parent pom 4.0.0.CR1-SNAPSHOT
JBIDE-12958 mbeans content proposal npe
JBIDE-13079 bad dialog title
Color coded votes on map.
Just a bit of clean-up
Removed http://www.addthis.com/help/address-bar-sharing-analytics
added coda clips
Draft Project Plan
Merge branch 'master' of https://github.com/spbuksh/CuratedGalleries
Template registration approach
client sends protocol version
cross platform mkdirp
[TIMOB-5100][TIMOB-7998][TIMOB-8363][TIMOB-8368] Add in ability to preemptively force rotation if the cached status bar orientation changes.
Replace two spaces with one
Capitalization and whitespace
Whitespace
Whitespace and comments
Whitespace
Cleanup

* Move a function for readability.
* Add comments.
* Simplify a function.
Whitespace and comments
Disable IME when system is chosen
Merge pull request #7 from srikanthlogic/bug-systemime

Disable IME when system is chosen
Merge pull request #6 from amire80/2012/10/14/cleanup

Whitespace and spelling cleanup
Merge branch 'master' of github.com:wikimedia/jquery.ime

Conflicts:
	src/jquery.ime.inputmethods.js
Fix jshint errors
Update "Hebrew 2011" to "Hebrew 2012"
Cleanup he-standard-2011-extonly.js
Rename Hebrew 2011 to 2012
Different names for Hebrew maps
Merge pull request #9 from amire80/srikanthlogic-portime

Hebrew layout - name update and cleanup
Modifications and cleanups
gitignore and test file added
currently failing trip test
hts-tvheadend: update to hts-tvheadend-0f3c6f7
initial Emperior version
Rewrote some rspec tests as cukes
adding ping pong icon
adding icon to base.html
[#1057] Tweak the FACA data a bit before running aggregates
Fixing code style and this is final
README fix
html generation
Added config.php and utility.php.
Merge pull request #7 from tagomoris/master

add graph id in view
x-powered-by
ver++
Use nuget references
Update last modified
Handle dictionaries
Add partial trust attribute
Upgrade to .net 4.5
Upgrade to .net 4.5
Add template blocks to allow adding additional account tabs easily
Merge pull request #285 from tangentlabs/extend-account-tabs-template

Adding additional tabs in the profile template
fix on templates - removal of old code that was left after refactoring
missing id on the target element referenced by label
Merge pull request #392 from jerzyk/template-errors

fix on templates - removal of old code that was left after refactoring
Some timing enhance

measurement interval incrised, added delay between output
rubish git didn't add my files
replace漏らしを
Update _responsive.scss

Include a $default-font-size.
You can now buy stuff from the merchant.
When the buy operation fails, display the reason why.
Add datafix script

When run this makes an init.d script that will clear up datadata full
errors by moving some apps to the data partition.
commited sublime text 2 project
Finished stubs of (objectify) DAO conversion.  Now to actually convert it!
Fixed module setup in util.  Fixed cmd line arg processing.
Tests written.
Added node_modules
Merge pull request #3 from skrenek/master

Implementation of init complete.  Pulling for npm install test.
Don't crash donation updater on bad requests
Add new CNAME file to source
adicionado gem nokogiri
Update cheerio version
pasta imgs
Write tests for repeated / segments
fixed script tags in qunit.html
Site updated at 2012-07-09 16:28:44 UTC
modify the scss
update metabox code
remove shortcodes, move to core functionality plugin
remove menu changes, move to core functionality plugin
move post types, taxonomies, metaboxes, and widgets to core functionality plugin
update readme
update documentation on be_dont_update_theme
update admin settings for Genesis 1.8
typo
updates to theme settings page
updates to theme settings page
minor changes to documentation
more doc changes, changing 1.0 to 1.0.0
move the class instantiation into a method
comment out $page_ops
use a function instead of method for class instantiation, facedesk
use get_field_value
escape theme settings
remove function used for testing theme settings
add note that Genesis 1.8 is required
Only load child-theme-settings.php if running Genesis 1.8 or later
Created tree obstacle
add directory and index.html
* Sidebar font progress?
remove associated actions when deleting spotify account
tomahawk side of creating a newly synced playlist
* No need to set the auto_vacuum pragma per connection.
Changes to the DiagnosticsDialog that updates when any changes happens
Don't make the context menus transparent as well. Thanks to nowrep for the hint
Merge branch 'master' into notificationcleanup
Vastly simplify mpris plugin by getting rid of unnecessary info system call
* Fixed crash in AudioControls. (merge)
Add spotify infoplugin for album lookups
Pointer safety
Automatic merge of Transifex translations
Update README.md
Update to allow a user document or ID to be passed
Formatted news post date and title
Added pidfile line so I can monitor the service using monit.
Fixes horrible typo
Updates version to 0.2
Merge branch 'release/0.2'

Conflicts:
	setup.py
Added parameter for output file
Merge branch 'master' of https://github.com/travisdesell/optimal_tax

Conflicts:
	second_stage.cxx
Added SPSharedSession quick access macro
Moved the setLaoded to in order to set properties before notifying KVO observers.
Change directory structure
Merge branch 'master' of https://github.com/trungtle/mvc_game_engine
hopefully working travis.yml
Event handling
Pulling
Install desktop file to /etc/xdg/autostart/ to make it autostart
Bump version to 0.2.0
Add total_pcm_frames argument to from_pcm() classmethods.

In cases when the total number of PCM frames is known in advance,
passing this in as an argument allows some encoders to process
more optimally.  For example, Shorten wouldn't need a whole
temporary .wav file created before encoding can even begin.
Minor fixes to from_pcm() unit tests.
added end messages based on DNA percentage, switched steering (now dragging tether/anchor), tried to fix multiple twitter-share page opens (still not perfect, don't know why
(360) waterpaint-normalcontrast.cg compiles as HLSL now
allow multiple taxons on rule too
Move pictures to object/
more work on vars
Correct r50-dev of three.js
this doesn't work
100% path
Make allowed_tags and allowed_attributes in CharField and TextField
default to []. Fixes #3. Thanks oxys for the report.
Updated README
Bump version
Ramhack changer removed, replaced with the OTF multitool
Print some important info to the deflog
adding movie app
Fix: memory leak in _table_put.
single player feature ready
Detect provider from its fields
Remove RCov
Remove Rails dependency
Loosen gem dependencies
Version 0.3.8
Set default hitpoints for NPCs
fixed no num aut
Site updated at 2012-10-18 11:39:22 UTC
Incrementing version
Adding overlay to prevent event while processing
Fix latest version of Backbone, start integrating Backbone Relational models
Update dependencies
Refactor Workflow Editor
Add development version of jQuery
Change parameters in Places controller
Add more missing dependencies
Merge branches 'api-places' and 'gui'
Fix Place and Transition grid item templates
Add symphonyno5.sh script 0.2.0 to folder
- add IDManager.
- id is successful for customer form.
- unique id for all forms.
-fixed a small bug
signature motion
WLPROD-8: [JS] reset styles and turn off zoom after changing image
Merge pull request #1 from lactose/master

Complete zoom setup on change image 
Merge pull request #2 from miguel-perez/master

Fix alternating images
修改导航菜单
git笔记
添加原文作者链接
修正语法错误
writeable streams
silly example, but I'm learning
- adaptation to match EOSBandi GPS code
- serial TX improvement (no more lag) thanks to the suggestion of kos

git-svn-id: http://multiwii.googlecode.com/svn/trunk/MultiWiiConf_shared@815 02679b44-d973-9852-f2fa-63770883b36c
- some improvement from kos (+load/save first implementation)
- new width size

git-svn-id: http://multiwii.googlecode.com/svn/trunk/MultiWiiConf_shared@828 02679b44-d973-9852-f2fa-63770883b36c


git-svn-id: http://multiwii.googlecode.com/svn/trunk/MultiWiiConf_shared@835 02679b44-d973-9852-f2fa-63770883b36c
Merge branch 'upstream_shared'

Conflicts:
	MultiWiiConf.pde
Workbench Fixes
Merge pull request #40 from sylus/master

Workbench Fix
upgraded to vario 0.4.1, replaced threads to actors and more
Remove unreachable lines

Change-Id: Ie7ec14f4ce65bc87b0cd49ec9266c394770ee7c4
Merge "Remove unreachable lines"
Add since 1.20 for Revision::READ_LATEST

Change-Id: Ifd33f6eca5478e2dc4d8092d509d5ca4f3eda34a
Merge "Add since 1.20 for Revision::READ_LATEST"
Backport compatible message changes from master.

Change-Id: Iad7b99e48e74ba6566030b88e41754302171e0a5
Update ProofreadPage to master

Change-Id: If636776f622360c78a334994e515b99c5c37644a
Merge "Update ProofreadPage to master" into wmf/1.21wmf3
Replace "No" in migration names with "V", reduce number of included tables in migration name from three to two
Site updated at 2012-12-27 15:59:51 UTC
Add cli ability to specify bucket
Updated readme
Site updated at 2012-08-06 13:37:30 UTC
Added Luo wen's information.
Added view transfer and save
add gradle plugin snippet
abe-laptop: Do not depend on metapackage wicd but on virtual package wicd-client
Большие недоизменения в параметрах плагинов (ресурсов)
fixed '...' bug
增加 MIT License 信息
优化 readme 格式、并完善说明
修改文档标题
整理文档heading级别
分行啊亲
Merge pull request #1 from cnsaturn/master

规范化 readme
adj and nouns from learn set added
ticket:3
created middleware.
fix temp for lambda
hist to lambda
Merge branch 'master' of github.com:yuval-harpaz/work-drafts
added details, uploaded to pypi
Removed file I just remembered existed for no reason.
removed another unnecessary file
Fix Guide types page formatting
Allow GH flavored markdown in yard docs
Updated tests autoloader
added textmate theeme
Timeshift support for HTTP
fix a bug with seek
add autoconf
add autoconf
Converted erGetOccurrenceIndex from e4x to xml2jxon

Signed-off-by: Michel Verbraak <info@1st-setup.nl>
Fix a FIXME: don't query sys.tables, just use SMO API
Using consistent urlRequest parameter name in AFHTTPClient
refresh raus
Policy: Show lockscreen before secure unlock (Part 1/2)

PS2: Fix commit. Only non-working unlock is faceunlock. Skips right to backup security(pin or pattern)

Conflicts:

	core/java/android/provider/Settings.java

Change-Id: I41c821e7d116cc28a4cb731aa402d781d2b4a56a
Lockscreen: Add vibrate on target lock

Lets add some flare, when the targets get snapped in Vibrate.

Change-Id: I8114beef14b330bd1626df64a4d77d809a1f84ba
Statusbar: Adds clickable actions for clock and date

Working as intended for now
Clock click alarms, long click google now voice actions

Date click today in calendar, long click new event calendar

my intent was to make accessing things like caledars, alarms, and
Gnow easier from the notification panel since thats where I generally
get notified if i need to add/ change one of those things.

I need to add Custom target options. Cuz Mike dont let me gets lazy..

Change-Id: I97b2caf75060e41ff5ebd83964d9bb310b5cdd13
testing fix for biometric with secure unlock

Change-Id: Ied92b8b0cc132e0a78777be4b1fc85052de73ed2
Lockscreen: Add vibrate on target lock

Lets add some flare, when the targets get snapped in Vibrate.

Change-Id: I8114beef14b330bd1626df64a4d77d809a1f84ba
Statusbar: Adds clickable actions for clock and date

Working as intended for now
Clock click alarms, long click google now voice actions

Date click today in calendar, long click new event calendar

my intent was to make accessing things like caledars, alarms, and
Gnow easier from the notification panel since thats where I generally
get notified if i need to add/ change one of those things.

I need to add Custom target options. Cuz Mike dont let me gets lazy..

Change-Id: I97b2caf75060e41ff5ebd83964d9bb310b5cdd13
Merge branch 'biometricsecure' into jb
Update Grid/Grid.php

Manage multi values
introduce a test-outcome base condition for all test outcomes
centralize test counter incrementing, re-signal test-outcomes in case anyone else cares.
Beefball test project for movement style 2 (LMB RMB)
Chat now disables in-game keyboard
add nuget def
FORNECEDOR+CLIENTE+LOJA+SEI MAIS QUE
created comp-list.twig from comp_list.php added competitioniframe to displays competition schedules
added if/else twig statment for table cell
Fixed document spacing in comp-list.twig, comp_list.php, and index.php

fixed comp-list.twig file spacing

fixed spacing
Merge pull request #99 from tbrookman/comp_list_tocomp-list-twig

Added competitioniframe to displays competition schedules - iframe for competition schedules doesn't work - need to create structure to render iframe.
PU test for SearchDoc->onlyCount() (refs #2732)
Corrected onlyCount() when searching with SearchDoc->only set to 'true' (closes #2732)

The onlyCount() method was not honoring the SearchDoc->only property, thus
always returning the count from the given family + the inherited families.
Merge pull request #348 from eguaj/3.2-A2732

3.2 a2732
fixed movies not being deleted
Added basic machine gun image
Another change from Prod
Done sets, now implementing sorted lists.
Trees print prettily, working on syntax tree.
Syntax tree done and tested.  Works nicely (with *,/,+,-,^) and can be evaluated (to double precision).
Fixes for UL bugginess
Merge pull request #1336 from SkyMarshal/BugFixes

Fixes for UL bugginess
Trying to stop JSON -> WORLD dumps
Merge pull request #1020 from Hawk-v3/master

Trying to stop JSON -> WORLD dumps.
Fixes for Antiqua compilation and runtimes.
DERP
Merge pull request #1327 from SkyMarshal/DetectiveWork

Fixes for Antiqua compilation and runtimes.
Prototype the FSG requested templated string() observer function.
Added notes for 250
All users send out their cards (encrypted and unecrypted) and their decryption key at the end of the game.
tools, readme
Miui Rom 2.8.30 update
OE: upgraded Joe Editor to v3.7
Crittnick introduced.
Rites are sent in the PresentYourselfRes message.
Workers selected dynamically via rites.
CritterData removed.
Only "new style" messages.
An old integration test removed.
Fixed Issue #17 (caused by narration bug)
issue #58 Multiprocessing branch writes measurements to .mat, .h5 or a temp file as appropriate
last of Image Uploads in Rails with TDD
Alterado: Footer para não desaparecer ao acontecer um click no mapa.
upgpkg: xorg-server1.12 1.12.4-2

Add provides to xorg-server
693 - Blog Admins can blog as themselves.
Add styles for notification dropdown
522 - Error Message Correction - Reflection
Forgot to update project and configs once I changed from 'hoptoad_notifier' gem to 'airbrake'

  * I setup the config/initializers/airbrake.rb file on all of the servers
finished example transformation function (still too long, need to check with users for complexity)
Divided configs into core and user.
New functions:

Series:
	- View series of books
	- sort books by series (see settings on admin page) - Bugfix
	- Show series on book details if book is part of series

Smaller changes:
	- Author is shown in list-view
Automake files for lib and src moved to config because of submoduling
Removed lib in preparation of submodule
Adding submodule of inform6lib as lib
Fixup autoconf stuff
Updated README.build
Update version to 6.33 (but not for public consumption)
oops
Implementation of <actor, action [n [s]]>
Fixed crash at Gilneas script. The issue is caused because aPlayer pointer is not properly initialized with NULL value at script object creation and therefore has random address value. Later on when we use that pointer we do not know if it points to a valid player object.
Updated to the latest version of WebLab
Added equations
Estimation
ifpoll: Closely follow the old status polling fraction in the compat code
rl: Switch from device_polling to ifpoll

Optimize the RX path a little bit by reading the RL_CURRXADDR and
RL_CURRXBUF only if necessary; reading these two registers is quite
time consuming
fxp: Switch device_polling to ifpoll
Remove duplicate word.

Contributed-by: "eadler" <lists@eitanadler.com>
Add acres to stand model
Update aspect test for new aspect calcs
working breadcrumbs up to stands
some pagination, dumb caching
Merge remote-tracking branch 'origin/master' into prototype
gems
re
Remove old JOIN command
Prevent rejoining a joined channel
Added "launch-async" option.
Extracted launch parameters parsing function.
Ignoring xcuserdata directories
randomNumber generator,when given same min and max, will return min
New version of the GUI. New martix displayed and added scrollView.
Merge branch 'release/0.3' into develop
Added a URL.
Fixed the license key.
We need to URL quote the username in case it has any weird characters
in it.
Refactored the tests and added one to show that the default secret function
will work.
The default secret is now the user's password field content.
Describe how the default function will work.
Now uses the key to determine the user name.
Removed some code which is now dead.
Bumped version number.
Merge branch 'feature/default-secret' into develop
Allow the timestamp to have an embedded 'T' as per the ISO standard.
Bumped version number.
Merge branch 'release/0.3.1'
Added base class and new PNG

Made a quick foundation for the Entity class to work on with Eric this
evening.
Fixed elapsed game time

Player moves all sexy!
Updated readme, removed redundant files, updated gitignore
Updated README syntax to fix localhost link.
GPU control interfaces + related merging and cleaning - Writing files prevent to boot, so commented for now
Fixed bug in invert mode

It would always be in invert mode, and I figured out it was because for
testing reasons I set it in the source files, but didn't unset it. :P
Added .disable() function for easier disabling

+ I added the g:numbertoggle.disable() function, which allows you to
  disable numbertoggle on any autocmd, or anything you want. Note that
  it just disables line numbering, does nothing else.

+~ Improved the way I disable numbertoggle for '[Command Line]' buffers,
   making it use .disable() instead of a workaround.

TODO:
* Fix the fact that line numbering is also active for MiniBufExplorer
  buffers.
Added new behaviour for tamertool (Tameable and Ageable), as well as for spawnmob,
added tame and sit spawnmob flags
false ist default
WinGui: Couple of Audio and Advanced Panel bug fixes.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5080 b64f7644-9d1e-0410-96f1-a4d463321fa5
remove chef specific build code, somehow made it into the helper
不具合の原因はwxSleepを消し忘れたせいだった。文字コード変換処理を正常に行うことに成功した。
アンカーポップアップ処理のスタブ処理を作った
[Download] Fixed downloader

The downloader always downloaded all data and it did not properly retried downloading the data. Both issues are fixed.
ShowData and getImage working now on jquery
Add initial ideas to README.md and add a COPYING file for GPLv2
Add initial directory structure
Add Installer class and a baserock-installer script

The Installer class provides the main window of the installer, based
on Gtk.Assistant. The "baserock-installer" script is the script that
gets installed into /usr/bin when using distutils.

This commit also adjusts the script headers a little bit.
Add initial version of the Welcome and Complete pages

The two pages are implemented as subclasses of a new Page class,
which provides various convenience methods for creating sections
etc. and will in the future also provide the general interface
to propagate results from one page to another.

This commit also introduces a util.lookup.Lookup class to load
files residing the installer directories.

Also add the Baserock logo to the installer, accompanied by a
copyright notice in README.md.
Add more pages: download releases and select a release

Together, these add support for taking the release repository
entered on the welcome page, cloning it into a local cache or
updating it if is already cached, parsing the releases in the
repository and providing the user with a way to select a release
for the installation.

The installation itself is not yet supported.
added WP7-MVVMLight template
framework/av: port change for vocoders support

- For EVRC, AMR vocoder support change missed
to port from ICS. Added the changes required.

Change-Id: Iab619ce435233d83943335574a104ecf88725c7b
(cherry picked from commit d40680a88ec0a209d3108bbdd0d360fc90a93a3a)

Conflicts:

	services/audioflinger/AudioFlinger.cpp
libstagefright: Fix for LPA playback not resuming after pause

-LPA clips playback fails after pause and resume.
-After onPauseTimeOut, LPA driver is closed.
-Do not trigger call of onPauseTimeOut.

Change-Id: Id5ae4fecc40dea8ab4431ab01bc7dafc56ffc63c
Merge remote-tracking branch 'AOKP/jb' into jb
adding a tester file
Update for 2.2.1
Changes for 2.2.1
first upload
Merge branch 'master' of github.com:JonnyBurger/ytannotations
fix sgx ion omap tiler from revert
modif cod includes pour mp et listeforum car balise en trop
权限界面优化，添加登录记录页面
poprawki umozliwiajace odpalic metode runserver
Added a load more results button in result activity
Merge remote-tracking branch 'origin/master'
some extra images
added guest checkout functionality
Fixed some label bugs in the Creator Dialog
shiro new saml implementation
Rework errors.

RemoteException used to be called SynchronousStompMessageException.
Also, it no longer inherits from SynchronousStompException, because it
does not indicate a problem with syncstomp.
renamed class containing error constants

The 'SynchronousStompError' class, which might be mistaken for an
exception class, has been renamed 'SynchronousStompErrorCode'.
Error codes are now strings
Main.java: Citesc din fisierul de config si pentru fiecare linie apelez
functia getPath din Config.java pentru a genera calea absoluta.
Config.java: functia getPath primeste ca parametru o linie si extrage
calea,daca nu e absoluta o genereaza si returneaza string-ul.
config: nu sunt sigura ce cale dau la OUTPUT...
Optional Feature Modified; Checking for Uppercase <SCRIPT> Tag; Modified generateLists() Warning

Replaced --enable-curl with --with-curl as the former pertains to the use of an optional feature within the code whereas the latter pertains to the use of an optional package external of the software.

Added charToLowerCase() in case stripMarkupTags() finds <SCRIPT> tags in uppercase.

Explicitly warns, whenever generateLists() is called, that if a given file is remote, to install libcurl.
fixed conf file name
bug #97288
added staging of LICENSE file
Improved on overall design. Removed unused events. Added required events. Changed Bookshelf to be the only model that is listened to. Book and Track now are not listened to. Their mutators are accessed by Bookshelf. Added interfaces for updates from Book and Track, since these updates must be included in Bookshelf. WIP on AudioBookActivity's propertyChange restructure.
pusher integration
Merge branch 'master' of github.com:MathieuCalba/door-bootler
combine background properties into one line
Add missing log4net.config.
Added helper to register IIntegrationProvider, loading from assembly via name pattern
Added post-build action. Changed path to <TVCORE> (to be used in both MP1+MP2)
Added series hover image to Reflexion (thanks Furnibird)
3969: Allow to add/removed MP2-ServiceMonitor to/from Autostart

fixing write access bug in WindowsAPI.cs
Config defaults and get methods implemented
Using remote IP to lookup location
Update to ModelSEED::Reference

- Now uses MS::Metadata::Definitions to generate schema
  for references. Added 'reference_id_types' to definitions
  to indicate when aliases are allowed.

- Cleaned up Reference code; invalid references should return
  an error upon object initialization and not during a builder
  call later in the code.
[fix] Improve UI and fix error in PlayUi
Reworked the watchrecordings window in recordings-ui.xml to have a vertical groups list rather than the old horizontal.

new file:   images/masks/watchrecordings_banner_mask.png
modified:   images/masks/watchrecordings_coverart_mask.png
modified:   images/masks/watchrecordings_preview_mask.png
modified:   recordings-ui.xml
Merge recent updates from Borg.
﻿Can now Draw rectangle and polypoints.
Adding RoSe configuration files
Adding monolithic service
Integrating RoSe to HomeNap to import and export services from OSGi platform
Minors revisions
Change from .csproj to compiling .sln
usaco-gift1
No more PHPUnit tests
database filler and statistics computer
discoveryf4: put back configure_com helper function
hwsettings: fix up GCS config UIs that used HwSettings
compiz-plugins-extra: fix QA issues, bump EAPI version, fix dependencies
Little fix with adding on void opts table.

Signed-off-by: Plaque FCC <reslayer@ya.ru>
Add tests for query validation
Changed to use crafty's built in gravity. all objects are affected by gravity. Changed from blue and green blocks to brick,animated windows, doors, and roof pieces
* R.I.P SimpleAI

- Convert SimpleAI to (DB) SmartAI
- Spell ids corrected (and completed some of the scripts)
- Random cleanup (code style) in some scripts
thanks to: Nay

Signed-off-by: Bootz <bootz@projectskyfire.org>
Scripts/Spells:  mage/warlock

* done some slight cleanup, and merged in a few adjustments from trinity
- for (Polymorphforms, twin valkyr)
Added an option to disable build tools in both auto scripts.

Signed-off-by: SkyFire <admin@projectskyfire.org>
Changed autoupdate to false and updated the url to a temp url
1.3.2.1 Update & Universal Script

1.3.2.1 update by WildKatana and fix by CodeEcho.
I have just made it work both on patched servers and old unpatched
servers.
Integrated medical support for units in battle
added mod_qos filter
Moving Snippets management to new controller
Removed operator= and fixed the update loop to reflect this change. Privacy on type and id were reverted back to private. Fixed a couple typo's in the update loops logic.
Updating default release and download URL format.
Merge pull request #1 from arfon/master

Default release update and download URL format.
Clarity edits
重构$.Matrix2D decompose方法
重构 adapter[ "transform:set" ]
重构 $.fx.update.transform
fix cleanNode BUG
ENH: Modified camera tracking to use filtered transform
Ajout d'un toString pour la panier
Renommer les getteur de livre pour plus de coherence :

Exemple : getAuteurId --> getAuteur
Panier plus propre + ajout d'un bouton commander
les header des tableau du panier sont toujours en gris (css)
Typography page specificity tweaks.
Fix a couple of compiler warnings
Revert hash and buffer sizes for unique, accidentally committed by Jim in 514c059
Fix: improve build on multi-GPU environment.
Fix: improve salt management.
Merge pull request #24 from Sayantan2048/magnum-jumbo

blowfish-opencl:performance update,7970 bug fix
Fix: local memory management done by host.
mscash: bugfix for codepage version of get_salt()
Alignment fixes in mysqlSHA1 and rawSHA0 binary()
Add support for GOST 3411. Authors: Jim, Sergey and Dhiru.
Make django a non-plugin with checks for OpenSSL >= 1.0.0
GPU fixes from Lukas
bash completion update
Merge pull request #26 from claudioandre/magnum-jumbo

Magnum jumbo
Revert "Fix: improve build on multi-GPU environment."

This reverts commit 9bf37df59e503ccd60705200446b9a1e18c9ee92.
opencl-mscash2: added split() and salt_hash() function
Added Contributor 84: @jimschubert (Jim Schubert) - Welcome!
Added contributor 89: @sashagit (Sasha) - Welcome!
Truncate the params to avoid huge comments
Ver0.30 RC8 バグ修正と選択が遅かったやつ修正。
Includes core file.
update sample after package refactor
changes to grid plugin
tegin kolumbia lipu või midagi

Signed-off-by: ivaat <taaviilp@ut.ee>
Yet another test :)
Generic name for a generic function.
Spruce up the loader a bit.
324327: Test LF issue.

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=324327
removed unused prop. on player object. roomID no stored in the client' socket
Made shoeDealerCard PROC and saved internally the dealers card in dealerCard
use cm's way of data cache prefix
LockscreenShortcuts : Fix minor bugs

Fixes :

      - Inability to have contacts/direct dials..etc on lockscreen (http://goo.gl/BKEJs)
      - Multiple activities of same type on stack.

Change-Id: I6c2c3e1c87239267601d78eb38778d0388f4a41c

committed by Danesh Mondegarian
Update Puissance_4.cxx

JeuArcade() : EffacerLigneGagnante : Fix : bug en colonne de droite
tweak lockscreen styles
WOW.. this shit is OOOOOLLLLLDDDD
Added DSpace Simple Archive Format
renamed the folder from deposits to formats, since they are used for more than just depositing now
Added basic support for file upload.
Change links to buttons for better visibility. Removed time from Date Submitted
REALLY fixes Roaper's custom item (I forgot to code the spawning thing-y for his ID) and adds mah cane.
Extra functionality Tile & TileOnBoard

Getters and setters for occupied and finished fields, roads and cities
on a TileOnBoard.
Fixed things suggested in the pull request.
Resize live volumes attached to an instance
Merge pull request #99 from rnirmal/vol-resize

Resize live volumes attached to an instance
Raise exceptions on user or database if a resource with the same name is found.

* Updated reference guest and guest API.
lwjgl added
slick added
ignore rules added
moved network stuff to own project
project template added
Merge pull request #2 from lqdchrm/lqdchrm

Template
Test Commit
Interfaces IWorld und ITeam.
Fixed markdown code indent in README
changes morning
changes
Updated tagcloud, new version now works as a plugin.
[BGs] Averages appear done

Three methodologies are included, none of which are tested.

Simple average: Each entry is equally important.
Time-weighted average: Each entry is weighed based on how much time is
between it and other entries.
"Camera flash" average: Each entry is equally important, except for
those within 10 minutes of preceding entry, which are logarithmically
less important. (Thanks plugnplay for the math.)

The "camera flash" average is selected in this commit.
Support nested kwargs extraction
Constness fixes.
Clear client flags on connection.
Remove unnecessary vars in entityState_t and corresponding netcode
add routes
finish routes close #10
fixing diviring. Merge branch 'development' of https://github.com/UpforDiscussion/git_demo2 into development
Checkbox in the right for proper align. Header now supports adding a page specific bread crump
Better binning
Added exercises
asdfasdfasdjkfhasdklfjhaslkdjfhasdf
Added missed version_type parameter to 	IndexCommand
Added Replication parameter to BulkCommand
Added BulkBuilder to support ES bulk operations.
nxtOSEK Curvature UPDATE
Update global README
Update hw0 README and REPORT
Removed modal on input focus

Improvement to UX
added admin
increased width
Put a little more information about our project in the About.aspx page
Control panel: IE related js bugfixes
Delete unused favicon.gif
updated readme
changed permissions
Founder photos gallery updates
Inner pages background update
Merge remote-tracking branch 'origin/design_updates'

Conflicts:
	press-center.html
even grayer
Implemented Basic HTTP Authentication for DefaultWebClient:

commit 62f1c1662a037f16de7de2932848cd36842ec84e
Author: Adam Wendt <adam@acehostingllc.com>
Date:   Thu May 31 11:25:29 2012 -0700

    Implemented basic authentication for DefaultWebClient.

    * Added private SetCredentials(Uri address) method to DefaultWebClient
      that is called from UploadValuesAsync and UploadValues to set credentials
      on innerClient based on the UserInfo field of the address passed in.

    * Tested that both UploadValuesAsync and UploadValues set proper UserName
      and Password if they are in the supplied address.

commit f3d70ddb61dea9a21af41dfee583ffe87174cc89
Author: Adam Wendt <adam@acehostingllc.com>
Date:   Wed May 30 16:38:43 2012 -0700

    Initial failing test of DefaultWebClient

    * UploadValuesSetsCredentialCacheOnWebClientWhenUserInfoInUrl: Implemented
      using Rhino.Mocks.
    * Changed DefaultWebClient so that it has a constructor that takes a
      System.Net.WebClient so we can test that it acts on it.
    * Made DefaultWebClient set innerClient.Credentials to a new
      CredentialCache to pass the test.
Y軸を自動で反転させるようにした
Add alternate completion reasons to DEBUG logging
Cleaning up empty line
use hominid new api and use jquery ui
Progress dispatcher test, r=paired w/ack
Fixed broken tests.
Imprimir el error después de mostrar números en modo DEBUG.
Fix on README formatting
Deleted temporary category file
feedback email is now completely set up
rTorrent dotphilez
修改忘記更改的圖片名稱並且新增連結icon->index.html
added zenity text
Got rid of mousewheel binding
temp link change for first batch of cfg style images
use "-charset" parameter
add dynamic product image handler for the blob
Fixed Vagrantfile and removed .django
dynaamiset taulut omaan pakkaukseen, ja pientä kommentointia
adding the paying up problem solution

Signed-off-by: anish kumar <anish198519851985@gmail.com>
Added basic 'edit' infrastructure
[MOD] Usine - création de plans : Divers

- Affichage des erreurs
- Message de présentation
- Réaffichage des paramètres envoyés

Signed-off-by: Benjamin Crosnier <bcrosnier@intechinfo.fr>
Merge branch 'master' of github.com:apocalyspace/apocalyspace
Apparently Facebook's OGP parser is too dumb to deal with relative URLs.
fix makefile regression
New test to check out neighbors
Ignored Files
Third commit
ok the real files are going up this time
fixed typo  in  CheckPositionTest
back to 1.0 - SNAPSHOT
[maven-release-plugin] prepare release magetabcheck-1.0
Deleted aulas/labmm00.md
updated electronics file - electronics11 is now final and has been sent to factory
Merge branch 'master' of https://github.com/ashirley/arduino-milestag
added some notes from matt
Merge branch 'master' of https://github.com/ashirley/arduino-milestag
added notes on battery life test
Merge branch 'master' of https://github.com/neothermic/arduino-milestag
Merge branch 'vhost-doc-cleanup' into swellpath-integration
Merge branch 'master' into swellpath-integration
Support vhosts that listen on alternative ports

- Include the port in the listen directive
- Add an optional $server_name parameter to nginx::resource::vhost so
  server_name doesn't have to match the resource's name.  This allows
  the creation of multiple vhosts with the same server_name that listen
  on different ports.
Merge branch 'alternative-ports' into swellpath-integration
Preserve Host header when proxying requests

Set Host header to $http_host, which preserves the port, if present,
rather than just $host when acting as a reverse proxy.
Add per-location proxy read timeout parameter

Add a proxy_read_timeout parameter to set the read timeout setting
per-location.  The parameter can also be passed when declaring a vhost,
in which case it will apply to the root location.
Merge branch 'per-location-proxy-read-timeout' into swellpath-integration
Add new nginx::resource::proxy_redirect type

Add new nginx::resource::proxy_redirect type to define proxy_redirect
directives within a vhost location.

Splits up vhost location template so proxy_redirect's can be inserted in
the middle.
Use server_name variable for ssl vhosts
Merge branch 'alternative-ports' into swellpath-integration
Merge branch 'proxy-redirects' into swellpath-integration
Add support for rewrite directives

Rewrites must be added to a vhost, and can optionally be placed within a
location.  They can also be wrapped in conditions.
Merge branch 'rewrite-support' into swellpath-integration
Fix multiple locations per vhost

Filenames for each snippet related to a location must match
{vhost}-500-{location}-NNN (or 800 for ssl) so they sort in the correct
order during concatenation.
Fix multiple locations per vhost

Filenames for each snippet related to a location must match
{vhost}-500-{location}-NNN (or 800 for ssl) so they sort in the correct
order during concatenation.
Merge branch 'proxy-redirects' into swellpath-integration
Merge branch 'rewrite-support' into swellpath-integration
Add support for aliases in locations

An alias can be specified for a location using alias_root instead of
www_root.  Aliases in nginx are similar to root directives except that
the part of the request that matches the location is stripped when
creating the path to file.  See
http://wiki.nginx.org/HttpCoreModule#alias for an example.
Merge branch 'location-alias' into swellpath-integration
Use split location
shebang at top, 403 handling, commented out duplicate support email req
improve the api for training and testing with probabiltities
Use built-in js-mode in place of Espresso from Emacs version 23.2.
Merge pull request #77 from nyuhuhuu/master

Use js-mode if available
put pretty function code into a hook function

I don't like the unicode replacements, and it feels cleaner to remove a function from a hook than to remove a font-lock keyword.

There is probably a good deal more duplication removal that could be done here, as the setups are essentially identical.
remove duplication in javascript initialization
add js-mode to esk-space-for-delimiter?
make a single hook that gets run from whichever javascript mode is used
Merge pull request #85 from stesla/pretty-function

put pretty function code into a hook function
Merge remote branch 'technomancy/master'
setup of mobile org
Browser is now closed after each attempt
Made the changes compatible with python 2.4
rake task for CP testing
Fixing issue #576
Merge pull request #578 from nicolas-simplex/master

Fixing issue #576
force utf8 everywhere
added link_header_to helper
set up filter by rating selection and sticky sort selection
Fixes #1421. It's not a perfect solution, since I used an alert to show the error on the screen, but it's better than nothing for now.


git-svn-id: http://ios.svn.wordpress.org/trunk@3594 7d847f7c-ffe1-4a24-85be-b788d016d96a
Removes a gap below the UIPickers on the iPhone 5.
Fixes #1385.

git-svn-id: http://ios.svn.wordpress.org/trunk@3595 7d847f7c-ffe1-4a24-85be-b788d016d96a
Fix typo

git-svn-id: http://ios.svn.wordpress.org/trunk@3596 7d847f7c-ffe1-4a24-85be-b788d016d96a
Updated English strings

git-svn-id: http://ios.svn.wordpress.org/trunk@3597 7d847f7c-ffe1-4a24-85be-b788d016d96a
Some minor string fixes

git-svn-id: http://ios.svn.wordpress.org/trunk@3598 7d847f7c-ffe1-4a24-85be-b788d016d96a
Fixes #1432 by hiding the label upon completion.


git-svn-id: http://ios.svn.wordpress.org/trunk@3599 7d847f7c-ffe1-4a24-85be-b788d016d96a
Fixes #1433 and #1421 by keeping track of changes on the FeaturedImage value.

git-svn-id: http://ios.svn.wordpress.org/trunk@3600 7d847f7c-ffe1-4a24-85be-b788d016d96a
Make sure that changes to Featured Image are checked even if the title and the content is nil.

git-svn-id: http://ios.svn.wordpress.org/trunk@3601 7d847f7c-ffe1-4a24-85be-b788d016d96a
Removing notifications from sidebar and NotificationsViewController code
Fixes an issue where the last item in the list would not be restored.

git-svn-id: http://ios.svn.wordpress.org/trunk@2937 7d847f7c-ffe1-4a24-85be-b788d016d96a
Fixes for the "no connection" tickets. 
No connection messages use consistent text. 
Adds a convenience class for displaying a no-connection prompt.
Since there was a lot of overlap I'm doing this as one large commit instead of on a ticket by ticket basis. Will close and comment tickets as appropriate.
Prompt remains a UIAlertView and not a custom non-modal view (yet). 



git-svn-id: http://ios.svn.wordpress.org/trunk@3434 7d847f7c-ffe1-4a24-85be-b788d016d96a
Missing from previous commit.

git-svn-id: http://ios.svn.wordpress.org/trunk@3435 7d847f7c-ffe1-4a24-85be-b788d016d96a
Moves the media and extra debug settings from the settings bundle to inside the app.
Settings bundle deprecated.
Fixes #802.




git-svn-id: http://ios.svn.wordpress.org/trunk@3436 7d847f7c-ffe1-4a24-85be-b788d016d96a
Removes some logging used to test settings.

git-svn-id: http://ios.svn.wordpress.org/trunk@3437 7d847f7c-ffe1-4a24-85be-b788d016d96a
NSString not NSNumber

git-svn-id: http://ios.svn.wordpress.org/trunk@3438 7d847f7c-ffe1-4a24-85be-b788d016d96a
Silly WPWebView, y u cast a UIScrollView as a UIScrollView?

git-svn-id: http://ios.svn.wordpress.org/trunk@3439 7d847f7c-ffe1-4a24-85be-b788d016d96a
Adds No Connection message to the Reader when the internet is unavailable. 
Fixes the issue with a stuck spinner when a user pulls to refresh and there is no connection.
Fixes #1309



git-svn-id: http://ios.svn.wordpress.org/trunk@3440 7d847f7c-ffe1-4a24-85be-b788d016d96a
Adds a stats webview for #1079.
Not 100% finished but enough to share.

A few things: 
There are some issues with navigating with panels that need to be resolved.
This stats pages are loaded via the webview, not via afnetworking. Trying to use afnetworking then load the page was causing issues around baseurls.
The stats page has accompanying style changes that remove parts of its chrome when displayed inside the app.




git-svn-id: http://ios.svn.wordpress.org/trunk@2772 7d847f7c-ffe1-4a24-85be-b788d016d96a
Corrected gae.version for ci builds
Fixed Polygon test
Renamed: collector.log -> data-collector.log
added some missing closing tags
Fixed potential crash in CalendarWidget
Tweaks to Calendar widget layout - still not happy with the half width ones
Removed icon from half-width Calendar widgets
Made 16px voicemail icon a bit bigger
minor tweak to widget picker layout
More text tweaks
Initial German and Portuguese translations
Merge branch 'master' of https://github.com/benjymous/MWM-for-Android
Added more Weather and Calendar widget sizes
Tweaked version on analog splash
updated credits in about box
Buying and Selling now checks if cargo space is available/adds back cargo space

- Just a small error that was in Ben's code before :) Fixed!
- Everything for M7 should be done now afaik
Added distance calculation and supplies to the UI.
Fixed small compile issues
bdd
developing bdd style
Use partial panel width for subsequent panels

After initial panel, all subsequent panels will by default be sized to
approx. 3/4 of the container's size:

width = containerWidth - containerWidth / 4
runtime -l flag to require login with credentials
first cut at xy sliders
sync sliders at panel startup
Remove ChromeDriver path specification
Merge pull request #2 from birdsarah/add_ChromeDriver_check_to_testShouldErrorThatItCantFindTheChromeBinary

Remove ChromeDriver path specification
removed some unwanted characters
removed index.html, duplicated nswjlps.sqlite for backup purposes, added sqlite_db.class and a test script
Remove unused objects
update Vert.x to 1.2.3.final
Allow AMQP host to be passed to tests via system property
added a bold button
Common dist files.
Updated Tracking Class
Andrew Updates
Added sections on code reuse and unit testing.
ajustando os passos do Getting Started
Reenable alternating /scrub and /playback-info
now allows centering arbitrary nodes
Adding notes on Ch. 7
added source files, moved Readme to src directory