labofsahil/github-event-dataset-2012 huggingface dataset:
Update notes for submitted changes

* Fix qcow2 instructions that used wrong partition
Adds a clarifying statement re: partition meaning

fixes bug 1033903

Have encountered several people who have been confused into creating some
huge amount of (physical) disk partitions by the text following this
change. So the idea here is to add a clarifying note so there is no
ambiguity about what "partition" means in this section.

Change-Id: Ieea81d8f1aad8ddf0f31697d4c2cd54a8b0c288d
Merge "Adds a clarifying statement re: partition meaning"
Update notes for submitted changes

* Added -nic port-id=<port_uuid_in_qunatum> support
Added MIT License to the code.
rank in a group
Let maven-invoker-plugin figure out versions for us.
I've heard good things about programming by contract - let's try it.
* Detect references to @Beta annotated classes
* Stop caching annotations on fields and methods - this was causing odd
issues, and of questionable performance bennefit.
* Better testing.
Add some useful site docs
Get the case right.
Add usage instructions
added widgets and menu
change native NET::HTTP to the gem net-http-persistent
cleaned up requirements
Folder Navigation add
client-side 3d initial commit

run joshsextravaganza.TerrainTest for fun times
Adjust error message to have the right, new name
Add LICENSE and Modulefile
Merge pull request #1 from pdxcat/prepare_for_forge_release

Add LICENSE and Modulefile
LPS-30744 Manually remove (yes, it's from an autogenerated file, but it complains in my Eclipse, will need to fix SB in the long run)
LPS-30824 ClassResolverUtil should not initialize the resolved class
LPS-29854 Fixing tests
Test Fixes - portal/controlpanel/roles
Test Fixes - portal/controlpanel/roles
Source formatting - rename confusing parameter
LPS-30708 Reverting b2cdb36
Test Fixes - portal/controlpanel/polls
Test Fixes - portal/controlpanel/polls
Test Fixes - portlet/addapplication
LPS-30880 Message Board does not correctly reply with quotes when using html format
LPS-30880 xhtml compliance means <br /> vs. <br>
LPS-30699 add clear identification of each configured LDAP
 LPS-30699 adding ldapServerId as attribute for User
LPS-30699 update UpgradeUser
LPS-30699 modifying LDAP auth to use ldap server preferences
LPS-30699 Should be a closing TR and not an opening TR
LPS-30699 Avoid nbsp since it's not needed
LPS-30699 Some places had ldapServerId before companyId, and some after. Standardizing on making ldapServerId always before companyId
LPS-30699 Use ID vs. Id in text
added data files needed to maintain twitter_bot state
removed unused files
Bump max supported AR version to 4.0.0.beta
Extra space
Alert message when JOSM cannot be opened. See #102
Arrow redraw

Arrows now redraw when the object is moved
doing merge only if campaign_data exists
Added regex tests
Merge pull request #153 from pinterest/Layout_Update_Crash_Fix

Fixed a crash when switching between layouts and/or different data sources.
Fixes deleting sections.

Signed-off-by: Daniel Thorpe <daniel.thorpe@corp.badoo.com>
Merge pull request #156 from danthorpe/delete_sections

Fixes deleting sections.
Add request to the Dropbox server for street list
Add request to the Dropbox for deputies list
Refactoring of project and add the fast coldstart
Refactoring and stable Parser version
working databseinitializer
Full refactoring. Working initializer and auth
Add social icons and twitter link
g
n
d
updated testing config (autotest, spork and cucumber)
gopi
Merge branch 'master' of github.com:pselvaraj/kanban_assistv0.2

Conflicts:
	app/controllers/item_data_uploads_controller.rb

	modified:   .idea/workspace.xml
	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/admin_controller.rb
	modified:   app/controllers/item_data_uploads_controller.rb
	new file:   app/models/ability.rb
	modified:   app/models/item.rb
	new file:   app/models/lead_time_cycle.rb
	new file:   app/models/lead_time_cycle_data_upload.rb
	modified:   app/views/dataset/_itemDataUpload.html.erb
	modified:   app/views/play/_play.html.erb
	new file:   db/migrate/20120325122301_create_lead_time_cycles.rb
	new file:   db/migrate/20120325123129_create_lead_time_cycle_data_uploads.rb
	new file:   db/migrate/20120325123534_add_attachment_lead_time_cycle_to_lead_time_cycle_data_upload.rb
	modified:   db/schema.rb
	modified:   public/javascripts/application.js
	modified:   public/stylesheets/style.css
	new file:   test/fixtures/lead_time_cycle_data_uploads.yml
	new file:   test/fixtures/lead_time_cycles.yml
	new file:   test/unit/lead_time_cycle_data_upload_test.rb
	new file:   test/unit/lead_time_cycle_test.rb
fixed bug, not saving hideonclick value
add missing db param to database_grant
Merge pull request #83 from agerlic/add_db_to_database_grant

add missing db param to database_grant
Update Modulefile CHANGELOG for 0.2.0 release
Merge branch 'maint/master/release_0.2.0'

* maint/master/release_0.2.0:
  Update Modulefile CHANGELOG for 0.2.0 release
fix merge error in ftl file, corrected mistake in sql script
If there is a problem with one of the setup/teardown commands (e.g. starting a cluster), the script doesn't execute any of the other commands because there is no point in continuing. If test suites fail or there is problems running their commands, however, the script will still try to execute all test suites because others may pass. This fixes an issue when I tested running the script twice with the same starcluster cluster tag, which is not allowed.
Fixed Gemfile for multi-json
Using environment setting to determine where to build stuff
Using environment setting to determine where to build stuff
Setting up a default def profile that activates in most cases because of developers, but whenever the environment is anything at all, it won't activate
nbproject added to .gitignore
nbproject added to .gitignore
nbproject added to .gitignore
working on articleDocumentDetailsPage, work done till related content segment
Changes
For events
twitter puzzle solution
Removing extraneous git-merge text that caused build error.
Fixed bug that prevented you from deleting symlinked dialogue lines.
Update modules/exploits/windows/browser/mozilla_mchannel.rb
Merge branch 'master' of git://github.com/sput-nick/metasploit-framework into sput-nick-master
Fix an ancient syntax fail
cleanup leftovers from gems
added a button and renamed it to differentiate between vs human offline and vs computer offline. current mode is vs human, vs comp will have AI
#000 Prasanna Added name column to Child and modified search
#000 Prasanna Removed explicit sorting of Child records nad moved it to order_by clause
Merge branch 'master' of github.com:rapidftr/RapidFTR---Android

Conflicts:
	RapidFTR-Android/src/test/java/com/rapidftr/service/ChildServiceTest.java
Use PDCA for Accel reads

Saves ~100us every FIFO access
Cofiguração do menu do site
Merge branch 'master' of github.com:reinaldoabdo/formal_eventos
include packages
Unit testing VM XML
added computerName and password as settings
adding VM deletion command
Adding create_ct script
fixed bounce to only images
add tidbit about ruby-mscs
fix extension
use better filename
change subroutine name
git-ignore swap files
add fastq conversion script
update scripts
use Taipan instead of Velvet
add usage message
add clustalw alignment
Rebase from 'release/interval_intersection' @ version '0.9.15'
Generated debian files for quantal
Rebase from 'release/settlerlib' @ version '0.9.20'
Generated debian files for quantal
Rebase from 'release/monocam_settler' @ version '0.9.19'
Generated debian files for oneiric
Rebase from 'release/stereo_msgs' @ version '1.9.8'
Generated debian files for oneiric
Rebase from 'release/diagnostic_common_diagnostics' @ version '1.7.9'
Generated debian files for precise
Revert "Trimmed the branch to only the kdl_parser sub directory"

This reverts commit 5ba2664959b86a105bc4339d19ac39a278504a4e.
Rebase from 'upstream' @ version '1.9.32'
Trimmed the branch to only the kdl_parser sub directory
Filter categories on slug opposed to name - which was only working for education where the name and slug were the same
если подключен redmine_local_avatars, то отображается локальная аватарка
Bumped the version for the next CPAN release
Minor doc niggle
Version bump
lots of updates to coloring tiles with the models, rendering ,etc.
Updated GUI Class and Battle Class.  Also added Enemy class and
BattleGUI class.
made pages ajax based
Adjusted the URL in readme so that it points to the new sakaiproject repo.
Fixed bug in collection.php which causes incorrect filtering
can upload+drag images
CKEditor helper and element name changed.
Select all the Pauls
Knockback is now dependent on the cvar\nMother zombies' knockback is reduced slightly from default\nIncreased max rounds to 10
assembly find
Merge pull request #30 from andrewjpage/master

assemblyfind
Todo list and future plans
Bug fix
Player inventory clear
Merge branch 'master' of github.com:sashman/MC_tehboyz_survival
removed superfluous import
updated todo list
created a gradle build file
Update git to version 1.7.9.6.
gh-4 Updated old code to account for undo changes
added a date group
Fixing install.
schema
Merge branch 'develop' into aleksandr
modified help
Merge branch 'aleksandr' into develop
added Ruby $LOAD_PATH problem
added Being Creative problem
removed Solution header from in progress problems
fixes in rt_browser - no more thread cookie anymore
updated example in rt_browser
one_version_commit
Update twitter dependency to version 3.5.0
Update haml dependency to version 3.2.0.beta.2
Update rails dependency to version 3.2.8
Update sass dependency to version 3.2.0
Streamlined it.

Cut back on functions and streamlined usability by making the
ConsoleColor an argument.
Working on new map and it's scaling

	modified:   AndroidManifest.xml
	modified:   src/de/unierlangen/like/customviews/MapView.java

	new file:   res/drawable/map_small.jpg
Added a new now real pretty map

	modified:   res/drawable/map_small.jpg
	modified:   src/de/unierlangen/like/customviews/MapView.java
removed aninmation
todo
stash
Refactoring project template.
Added some links to the frontpage
подравил иконку мешка
NLTHTTPStubResponse のレスポンスヘッダを指定できるようにした
Merge pull request #4 from slightair/supportResponseHeaders

NLTHTTPStubResponse のレスポンスヘッダを指定できるようにした
URICheckBlockがBOOL返す必要がなくなったので消した
チェイン用のプロトコル用意した
stubってするとスタブ作って返すようにした
HTTPStubResponseにchianing実装した
headerPresetとDataPreset
contenttype+charset
PlainTestはPlainにかえた
content-type chaining
すでにhttpHeadersを定義しているときのテスト
NLTResponseDataPresetChaining実装した
fix linebreak
charsetの指定に対応した
AFNetworkingでチェイン方式のテスト書いた
Merge pull request #8 from yaakaito/method-chain

Method chain
FiveBytes type implemented
Dev can programatically dismiss notifications

[Deliver #30953129]
Fix incorrect conversion between degrees and radians.
Add progress feedback
Added idle timer to show photo presentation.
Implemented delegation for presented view controllers to inform presenter view controller to dismiss
Added a Category for button with colour, shiny and transparent background.
The registration view controller is not fully configurable through configuration properties.
Added support for multiple slideshow images preloaded into the app.
Merge branch 'master' of https://github.com/sosandstrom/legend-passbook
Implemented support for settings.
Selecting the store (still needs to be downloaded from the backend)
Merge branch 'master' of https://github.com/sosandstrom/legend-passbook
rest of stuff (1179 - 1197)
repo links for reference
updated examples
updated ignore list
Relative line numbers!
Fixed Table, made everythhing ArrayLists, made a toString for table for better display of table cards in console
Fixed Table, made everythhing ArrayLists, made a toString for table for better display of table cards in console
Update Cerberus Backup
Add Modernizr.lastchild test
Make IE8 read ie.js too
Cleaned up legacy XmlSerializer code

* Switched out custom attributes for System.Xml.Serialization attributes
* Removed unused methods from IXMLNodeSerializable.  It is now an empty
  marker interface.
* Changed usages of GetInterface() to IsAssignableFrom, for compile-time
  type checking
LaTeX-Package: \elected{} für gewählte Personen/Alternativen
Protokoll Mitgliederversammlung 2012-01-08
Merge branch 'dokumente' of github.com:stratum0/stratum0-dokumente into dokumente
scide: improve strings related to lookup dialog actions

* change "definition" to "implementation" to match the shortcuts
* improve consistency
* add "..." to actions that don't operate on cursor selection
supernova: win32 compile fixes

suggested by Victor Bombi

Signed-off-by: Tim Blechmann <tim@klingt.org>
(cherry picked from commit cbc69610af6d287284684c71d09491ca90f50eda)
Patch: Update to ensure CART is not cached, showing all users the same irrelevant header
Merge remote-tracking branch 'rupert/MagentoCartPatch' into unstable

Conflicts:
	templates/default/varnish.vcl.erb
Fixed some MonoDevelop warnings
fix syntax

Signed-off-by: Adam Saegebarth <adams@synapse.com>
tilfoejet vektor tegning af robot
fjernet tidligere version af autogenerate diagrammer
Merge branch 'development' of https://github.com/syre/SortingIndustrialRobot into development
https feature added
guide pic update, doc update
fixed issue with empty QUERY_STRING
minor adjustements
GEO breakdown
readme
restructured sections
stars, etc
stars, ndbs
ndbs, lqmo 1A sids
lqmo 1B SIDS and ese descriptions
fixes, positions
mostar ground and stars, sarajevo ground
ese
Fixes textmate/shellscript.tmbundle#10
Merge pull request #11 from wafflesnatcha/issue10

Match long variable names before short ones.

Fixes textmate/shellscript.tmbundle#10
Add execute line commands.
Switch to a meaningful directory before executing command.
Add readme.
Move folding settings.
Improve comment.line match.
Insert bash-init call.
Change tm-file: → file:
Add initial semantic classes.
Remove trailing space for “Execute and Replace”

I tend to use this with commands like ‘uuidgen’ and similar where the trailing newline is in the way.
Shebang snippet bound to env⇥ when at begin of document

Now that we can scope the action to only fire when the tab trigger is typed at the beginning of the document, we can simplify it without fearing that it will clash with other snippets.
Merge branch 'master' of git://github.com/textmate/shellscript.tmbundle

Conflicts:
	Commands/Execute Line and Replace With Result.tmCommand
removed the eos dedconfig and swaped it out with e generic based on the same one
reverted syste/core to sts
added resynthesizer gimp plugin
add options example
refactor all Yo receiving SMS use same class + delete number on test name
stricter permissions on mongo's conf file
changed name of cpp file
Fixing on XBOX/WP7 version
Update the web.config file again to not display custom error pages, I overwrote this change in the last commit by mistake. This will be deployed to AppHarbor for debuging the live server. This should be removed later.
cambio en texto
Merge branch 'branch1'

Conflicts:
	test.txt
make exists key backward compatible
Move ID attribute of ValuedInterval up into Interval and make Interval fields private. Set Interval ID of SAM entries to be the read name.
Initial batch support...  Not yet tested, but works with -1
Renamed bin file
Bumped version to 0.2.9
Initial push of website
Added fallbacks to stories template in case images or source files are missing in English
added URL to vimeo video
New security scripts
still cant drop databases
sh
a
Adding Sublime Code Intel, Drupal Project and Drupal Snippets
Removing SFTP
A whole bunch of cleaning up.

- Added .gitignore for proper files
- Removed ignored files
Flyttet SSRDAOTest fra BRS
Formattering
added travis branch specific png
add wassup stats and google analyticator
[Sumedha and Sharanya] Wrinting functional tests for admin login. #Admin Logs In
Merge branch 'master' of https://github.com/twu28-TeamC/twu-zombie-dash
[Sumedha and Sharanya] Changed the display image, added functional test fot the login page and also added page titles for login forms. #Admin Logs In.
Common external gradle build scripts
Removed serializer.TextField and related tests
rename GetTreeDataView to TreeDataView.
add missing comments, clean up imports, filenames, templates.
Enforcing access controls on video assets controller
Splitting recipes per OS for more control
Splitting recipes per OS for more control
Newest entries content
Quote content
put locations in separate file, added init()
/ ‘test_sparkle.txt’
Add header FT_GLYPH_H to the amalgamated include
lol
Merge branch 'master' of github.com:w2schmitt/depth-complexity2
yes
検索0のときに広告を入れる
webos-ports-lib: Add README.md

Open-WebOS-DCO-1.0-Signed-Off-By: Josh Palmer <jpalmerwatkins@me.com>
initial imports
fixed recording bug
Added project files
Merge branch 'master' of github.com:webgeeks/uc_tracking_simple
trying with ip rather than domain name
Finished Smith2009

separated exp/site details.
Fixed frameshift in data for 416
Can't use 416 as a comparison. Compare all burn data to each other (not
sure which is the control, but each represents a change).
Updated Smith2009 ref data
fixed end syntax
Revisions to accommodate variations in parameters
passed by various LMSs and to improve coordination
with Login.pm and Logout.pm.
Add the script ww_purge_old_nonces for purging old nonces
to the webwork2/bin directory.
Merge remote-tracking branch 'wheeler/master' into fix_openwebwork
Merge commit '416cdab2d605d4a30bcf3a14483c9236e31c822f' into dev

Conflicts:
	conf/global.conf.dist
initial commit
refined picture
Merge branch 'master' of https://github.com/winterfroststrom/povraytest
Fix ReST formatting on PyPI.
Bump version.
Added ability to switch git branches + databases at the same time.

Could add more options for other branches + databases. Later.
1 update submodule custom widget
2 change test project app delegate
forgot to change workout type to the display version
Removed: Unnecessary message
Improved: Command and block check
Changed: Cleanup
Updated: Metrics
Implement basic handshake
bug
死bug终于弄死你了！！！！！！
人人及微博
Merge branch 'master' of https://github.com/xupeilong/InternetRuntimev2

Conflicts:
	renren/src/com/yourdomain/webcanvas/WelcomeServlet.java
	sed/loaclhostTointernetrt.org.bat
	weibo/src/Servlet/WelcomeServlet.java
added author profile yvoschaap
project files checkin
Remove utility submodules.
Add dependency on Guzzle HTTP client.
Split server configuration loading into separate methods.
Register parameters.
Add default config parameters to service definition.
Validate conditional configuration.
Clean up syntax.
Add style include path parameter and rename server parameters to 'base'.
Implement backend style server delegation.
Add service definition for delegate style server.
Add basic method comments.
Return framework response for delegate request.
Implement basic style server include response.
Update composer.lock for Guzzle HTTP client.
sample instance based off of cassie-schema-statistic.xsd
bug fixing, multiple logins
use RO git url for flaskbars. else test hangs
With the additional jQuery features, show them on the doc
Adding Services feature #2

- Added Models.Report
- Added Models.ReportCollection
- Added CrawlReports function to Services.js
Adding Android Scalable
TilingScheme improvements

- Use the number "level zero tiles" rather than "root tiles" since there can be
more than one tile at level zero.
- Add a TilingScheme "base" to hold methods common to all TilingSchemes
  and to give me a place to stick documentation of the TilingScheme
  contract.
- Return tile coordinates in a Cartesian2 instead of an object literal.
Fix 2D culling of central body when rotated.
Clean up calls to Math.min and Math.max.
Merge pull request #78 from AnalyticalGraphicsInc/cb-2d-culling

Fix 2D culling of central body when rotated.
Clean up some code, tests pass in Canary but fail everywhere else.
Finish Extent

1. Add new methods from the imagery_layers branch, since they are generally useful and would eventaully go into master anyway.
2. Add proper error handling.
3. All functions now take result parameters.
4. Test coverage at 100%
5. Complete documentation.
6. Optimize code calling Extents to use result parameters.
7. Update CHANGES
Tweaked CHANGES.md.
Minor cleanup.
Merge branch 'master' into extent
Merge remote-tracking branch 'origin/master' into extent
Update CHANGES

Also rename SunPositionSpec to computeSunPositionSpec to match previous change.
Merge pull request #208 from AnalyticalGraphicsInc/extent

Finish Extent
Merge branch 'master' into czmlLayers
Add default value for Matrix2 constructor parameter.
Clean up documentation and tests.
Creator name fix
deleted:    bashmount
Removing unneeded files and images
Adding view controller classes
First pass at abstracting out post states, so you can register your own arbitrary states. This should cover it at the PHP level.

Still need to update the widgets and the Javascript

See #23
Added arguments for messaging methods.
Update _posts/2012-08-11-using-trello-for-project-management.md
Add due date to new tasks

* New tasks now have due dates attached. For now this is mandatory but
  it will eventually be optional
* Updated how tasks are displayed in the task list in the main activity
consulta sobre incidencias sin respuesta dado un user resuelto (tirando de java)
consulta de obtener incidencias dado un user
Merge branch 'master' of github.com:Carlosmr/secret-octo-nemesis

Conflicts:
	src/main/java/isw2/repositorios/persistencia/RepositorioIncidenciasImpl.java
Added packet send event, fires after regular updates
Added owner to Items
added readIn and writeOut methods
Merge pull request #51 from Monseigneur/master

added readIn and writeOut methods to FilterStore
test records in correct format

git-svn-id: svn://oss.dbc.dk/sync_php/php/OpenLibrary/OpenFormat/trunk@46112 30e9dc4a-7611-4fbc-83ba-eecf79b76bd0
all relevant records in ris format

git-svn-id: svn://oss.dbc.dk/sync_php/php/OpenLibrary/OpenFormat/trunk@46114 30e9dc4a-7611-4fbc-83ba-eecf79b76bd0
delete of irelevant records and corrected for errors

git-svn-id: svn://oss.dbc.dk/sync_php/php/OpenLibrary/OpenFormat/trunk@46115 30e9dc4a-7611-4fbc-83ba-eecf79b76bd0
all test records

git-svn-id: svn://oss.dbc.dk/sync_php/php/OpenLibrary/OpenFormat/trunk@46116 30e9dc4a-7611-4fbc-83ba-eecf79b76bd0
Can now be used by multiple concurrent users
Comments to make things clearer
Clearer build instructions in readme
[Twig] Few new filters and functions.
Added new generic materials: anisoward and metal.
Added support for more mirror providers, and added a provider for I-BlockList. The SourceForge provider is out of date now. The date / time of the downloaded filter is now shown, and now supports both GZip and Zip filters.
Fix Distract
installed debug plugins, played around a bit
updated humans.txt
i have no clue what is fucked up
deleting that debug plugin
Merge branch 'feature/broad-styles' into develop
compiled styles....dunno why i needed to.
tested an inline block hack in the ie.css file, altered the @font-face rule in mixins to accomodate
installed category-images-ii plugin, did a proof of concept with it
tweak .gitignore to ignore the uploads/ directory, doesnt need to be tracked. Also corrected typo in humans.txt
uploads folder
category display on home page, limited posts, setup feature image display for 1st post on home, moved search bar, added description, did more than I should have in this feature branch
omfg
omfg
painful merge to develop, gitflow needs to be done with sudo
gitignore
remove config
omfg
Merge branch 'feature/categories-display' into develop

Painful fucking merge, and removing wp-config
omfg
release 0
更新alien
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal
解决道具类和子类构造函数的bug
Merge pull request #107 from xujianming/master

解决道具类和子类构造函数的bug，解决Alien里的bug
Signed-off-by: JIANGJIAZHI <15920547708@139.com>
Merge pull request #72 from JIANGJZ/master

修改了Configuration增加QASetting
Add boilermake files for rlm_ippool
removed some old libraries
Added QuizLearnMoreLinks y QuizTextResults objects and json read.
Add more Perl 6 changes to blog article.

Currently, the changes aren't too exciting compared to previous week,
but we still have three days - who knows what will happen then...
Besides, isn't Rakudo Star release awesome enough - I mean, it brings
newest changes to useful and usable distribution of Perl 6 - you know,
without installing Panda :-).
Hide save and undo button on save
Fixing small bug
Use last-inpuut-event instead of obsolete last-inpuut-char.
apagando coisas
Fixed the slider initial status so that the selected team is always visible
Updated git ignore
Added git ignore
Added capfile
Updated rvmrc
"delegator === delegator" should be true
Fix volume track skip control with 3rd party applications

Current code is using ordered broadcast to message the audio
framework of a track-skip. This breaks many 3rd party audio
players as the broadcast will be received by the application
with the highest priority. This change uses
"dispatchMediaKeyWithWakeLockToAudioService" to send the event
to the Audio Service which always knows which audio application
is active.

This change was comitted to CM and this commit is based on the
CM one (though key logic in AOKP is different).

Patch set 2: Original authorship changed.

Change-Id: I51e5e58b56159bc2d835cc24962a560257a30b20
Lockscreen: Add Circles Lockscreen to AOKP - AOKP, xoomdev the man

Optimus 4x lockscreen port - original port from evilisto

Modified to be more customizable/compatible with
other sized devices. Ring colors, backgrounds
customizable. Custom lockscreen layout with
custom clock.

Change-Id: I31d70978b47d81c6d8b6bf8ab2d41c98e17b5a54

Conflicts:

	core/java/android/provider/Settings.java
List: some code cleanup, more comments on map functions.
Tweak generic styling of list items.
EA-39115 - INRE: FileBasedIndexImpl.handleDumbMode
create method from usage: do not qualify already qualified ref (IDEA-91041)
IDEA-91339 Darcula: "No files are open" looks weird
Merge remote-tracking branch 'origin/master'
IDEA-83555: check file content just before loading
(cherry-picked from 54bec1c)
forbid refactoring in dumb mode (IDEA-85312)
(cherry-picked from 4ac6084)
IDEA-96512 Create new task UI too small [r=kb]
[r=Alexey.Kudryavtsev] IDEA-92230 OOM when indexing jar with large text files
(cherry-picked from da0bff1)
IDEA-95230 Brawn color labeled as Yellow in File Colors when in Darcula
IDEA-95231 Violet is too bright when in Darcula
fix JavaStylePropertiesInvocation
suppress UnusedProperty in GroovyIntentionsBundle.properties
correct name for intention category
create groovy method from usage in java file
'create groovy method from usage' position caret at the beginning of selection
copyright in testdata
create groovy method from usage by groovy ref
Bug fix in forms plus docs
Revert "net: Fix Samsung derpage"

This reverts commit 2627f4a9f38a638af00792aaa7b03d67a3fe10a8.
net: Simpler fix for Samsung derpage
Changed Key + Spanish translation
Fixed a bug where fetchArguments was not applying user-specified threshold length.
Added some more test files.
Petite clarification pour la ré-écriture d'URL, il faut éditer une ligne du fichier .htaccess.

Signed-off-by: Kevin <kevin.ryser@koweb.ch>
Fix quickfix for exercise descriptions [Closes #71]
rename production db
Updated for new upstream release, 0.95
Confirmation when syncing from repository to forum

Added a check when syncing from the repository to the forum to confirm
it will overwrite changes.
Made some links save the sync direction and show options from the query
string.
Manage links only show when sync mode is forum > repository.
Submit button now hidden if no files to sync.
reference Theme
Fix "Argument 7 passed (...) must be an array, null given"

It occurs when "app/console translation:extract" is called without a --dir parameter
Merge pull request #34 from frosas/patch-1

Fix "Argument 7 passed (...) must be an array, null given"
Merge remote-tracking branch 'upstream/master'
clean up references to the old wp scraping based code
Combination.class tested. Bugs fixed.
Fixed the issue when it was not possible to disable ip access policy, country access policy, hotlink policy, url signing on when editing CDN advanced settings
- Ignore eclipse stuff
 - Adaptions for new test stuff
Add note about location
Fixed extern C to include parameter "(jstring) file".
Fixed error caused by the recent storage being dependant on API level 11. Everything is now compatible with API level 8 again.
Implemented functionality for handling a touch-move event. love.mouse.getX() and .getY() should now be practically usable.
Change filenames to avoid some deprecation warnings.
Automatically use the slug for generating URLs, and try finding with slug first.
Updated prototype case to better fit wiring and protect battery
new style add form
Correction in recovery file /etc/recovery.fstab when /system is wiped!
merged some features from RealMayo repo
Using Require.js to load modules.
Templating with underscore.js
Parse the status and add links to hashtags, urls & usernames
Set tweet as Backbone Model associated to its Backbone View
Merge branch 'develop'
cambiar routes
First complete version of the mediation portlet
removed template file
removed template file
Make the SSL crt parameters required, the parent mapping already is
An example of using open layers to highlight text on JPEG.
realizados los ultimos cambios
reload and refresh.
removed extensions forcibly from repository.
Configuration of SciSmalltalk update to 1.02, added development version, split packages from Math-All
Using a list for shorter and more managable code.
deciding to ignore features dir
Adding Server files from first assignment

These are the files that were used for the message handing on the server
side for the first mobile assignment
Revert "Revert "Revert "Revert "Revert "[GitTest01] NSLog updated"""""

This reverts commit d8beb26d8e104a5bce753ec69de689bfbac15340.
Don't try to guess which column is current, let the user specify it.
Ajout menu simple en attendant d'en faire un vrai.
Merge branch 'master' of git@github.com:Tacoid-Team/SuperFlu-Android.git
added multirip demo
Updated docs (SDD) with a new package-uml

may need some updates later on
part to make cmera sounds off work
Merge branch 'jb' of github.com:TeamSourcery/frameworks_base into jb
finish shell search path
add a sublime key
Resistenzen von Mumie weniger extrem gemacht.
enews 11-19

The newest november enews is in the nov_enews_12 folder
Fixed a bug in index.html of enews
redesign - youtube box
Adam Clark, Josh Zavala, Nick Stanley - Assignment 3

*Created 3 phase boss
*Added tilemap
*Update miscellanous spritesheets and classes
Added support for game object importing to content pipeline
Fixed the bubblebullet's spritebounds
Added viewports
Added level manager
Merge branch 'master' of https://github.com/zombiepaladin/scrolling-shooter
*Added Lavabug, Lavabug2, Mandible, and Photon classes

*Cleaned up code in previously written classes
Merge remote-tracking branch 'Nathan/master'

Conflicts:
	ScrollingShooter.suo
	ScrollingShooter/ScrollingShooter/ScrollingShooter.csproj.Debug.cachefile
	ScrollingShooter/ScrollingShooter/ScrollingShooterGame.cs
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/ResolveAssemblyReference.cache
Revised LevelManager
Let LevelManager draw and update all game objects - need to optimize later
Fixed bounding issue for GameObject update and draw regions, added ScrollingSpeed variable to GameObject
*Modified Photon logic
suo hates me
Merge branch 'master' of https://github.com/zombiepaladin/scrolling-shooter

Conflicts:
	ScrollingShooter.suo
	ScrollingShooter/ScrollingShooter/Enemies/Panzer.cs
	ScrollingShooter/ScrollingShooter/ScrollingShooterGame.cs
	ScrollingShooter/ScrollingShooter/Shields/EightBallShield.cs
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/ResolveAssemblyReference.cache
	ScrollingShooter/ScrollingShooterContent/ScrollingShooterContent.contentproj
Updated scrolling to apply scroll delta to player
Merge branch 'master' of https://github.com/zombiepaladin/scrolling-shooter
Updating the commit
Update commit
Updated lavaLevel2.txm
Pushing my resolved merges back into my fork

Merge branch 'master' of https://github.com/zombiepaladin/scrolling-shooter

Conflicts:
	ScrollingShooter.suo
	ScrollingShooter/ScrollingShooter/Bosses/Boss.cs
	ScrollingShooter/ScrollingShooter/Enemies/JetMinion.cs
	ScrollingShooter/ScrollingShooter/GameObjects/GameObjectManager.cs
	ScrollingShooter/ScrollingShooter/Projectiles/Projectile.cs
	ScrollingShooter/ScrollingShooter/ScrollingShooter.csproj
	ScrollingShooter/ScrollingShooter/ScrollingShooter.csproj.Debug.cachefile
	ScrollingShooter/ScrollingShooter/ScrollingShooterGame.cs
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ScrollingShooter/ScrollingShooter/obj/x86/Debug/ResolveAssemblyReference.cache
	ScrollingShooter/ScrollingShooterContent/ScrollingShooterContent.contentproj
	ScrollingShooter/ScrollingShooterContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
WIP changing loggers
Compile XML processing regular expression only once.

Requests per second from ~95 to ~98 with a "standard" test.
Always replace the database user parameter in the XML style

This provides for an automatic migration of styles to any new
authentication user.
Rename authenticated postgresql user configuration setting

See issue #49
Fixed download link.
Merge branch 'simple-scan' into current
Complying with android warnings
Guidenote added
sell_products not compleate
attempted fix google analytics
improved caching logic and github api mocks
Added export help link for Opera
Merge pull request #1 from yuxel/master

Export link for Opera Browser added to Readme
Pass params to the USchedule iframe
Change Eyeline to Eyeline Golf
Fix issue with USchedule not going to the main page
Tweak the layout for tablets
Update the contact form with more Eyeline stuff
added change done automatically.
Build for testing.
Fix announcement position with reserved edge.
minor fixes in the comments
refreshed demos
refreshed setup.py
Move api to be sub module
move mobile to be sub module
move profile to be sub module
add quiz attempt to models
update urls and translations
add translation
user registration almost working
get registration working
Update to jQuery 1.8.2
getting mobile login working
change to use ApiKey auth and get login working
change to use decimals instead of integers for scores
Change to use ApiKeyAuthentication
Photo Upload updates
Cleanup indentation and fix possible crash when disabling last sensor

This should hopefully fix bug LP#1086102
Remove trailing whitespace in .gitignore
la version con session
Removed unused import in SearchResultsActivity
bumped minor version in order that authentication changes are picked up by ertp
Moved a part of Places that was related only to Licensify, to Licensify.
Added colours palette link to index
Added the Ragequit post
pagination added with will_paginate gem
search form html
Search, Sort, Paginate working together
faceted search workinggit log :)
- FacetProc handles empty objects exeptions
- Handles empty cables case
- User login and logout links added
Added average efficiencies for one-vs-one

Mainly added two things:
1. Added command line parameters in glpk_efficiency file to determine one-vs-one/one-vs-all/dense/sparse.
Depending on this, it modifies the name of the output files
2. Computed average efficiencies for one-vs-one and written in file so that these can be compared to one-vs-all efficiencies
added wists
Cleanup
Wants me to commit "changes"
Update appositive + add speaker rule
publish
publish
consol
Merge branch 'master' of https://github.com/anoopchaurasia/importmanager.git
Added extension description
Added Module Caching and Suffixes
Removed duplicate section 4.1 due to merging
Mais uma da Ohanna
TIMOB-10166: Apply fix for TIMOB-9469 in table views
Merge pull request #3006 from ayeung/timob-10166-2_1_X

TIMOB-10166-2_1_X: Apply fix for TIMOB-9469 in table views
Added generic event receiver, updated read me
telephony: Add basic RIL class for Samsung's MSM7X30 devices

* Custom NITZ handling so automatic timezone works
* Correct signalstrength handling

Change-Id: I319ef8681d483105a82fba5bd84eecd557f7b5ca
Triggering EarlySuspend based on BackLight brightness

EarlySuspend is triggered currently based on just timeout. Due to this,
backlight brightness is not coming down to zero.

Allowing display turning off animation before Early suspend.

This change passes display turning off information to
animation call so that display off animation can be played
before early suspend call.
Reverted two and three changes in the below list with this patch.
Changes introduced in previous patch were:
1.Send early suspend call after display baclklight off
2.All animations off once display goes to dim.
3.Removed duration to turn off screen as i don't see this in ICS.

My edits:
PS1: Add a config option so it doesn't break non-qcom devies. Thanks to Arne for the idea
PS2: Fix up logic

Change-Id: I640ca93843bc15c7761ba2fb2b2188c8a092bb9c
legacyusb: Fix USB tethering

Change-Id: I79e2fced6660b9bb47ab47a96d46b29bb57e0ee3
applied the code styling policy
applied the code styling policy to CategoryTest and renamed the testcases for constructors to meaningful names.
added some code changes
Removing external theme
Put world map data into the python script itself.
Created shortcode for the display of participating companies.
Added class to each third company included in the list.
Fix for shape2simairedb.py to not update vehicle flow when inyear = outyear
My first commit
Merge branch 'master' of github.com:azurebubbletoes/arneil_flash
This is my second commit
Require explicit versions.
Remove unneeded whitespace.
Update to new version of express.
Add barbones README file.
Add newline
Removed the previously mocked view in plain HTML.
luwa
Improvement

Updating viewport analysis to initially set width to 1000, as 970px is
the universal width of all sites in our network.
Initial upload of LESS.mode
Real Readme content
인상깊은 광고 2종 타이틀 수정
added a few placeholders
second fix for 'application/directory'
Moar trivial doc patches!
decided to use xsession method.
more links
converted posts plus a new one
-creating dispatch queue for each block operation
improve layout for twitter widget
fixed bug for what is displayed when there are no tweets, tags, or when its loading more
IMPLEMENTED:
Take reference image
Take target image

TODO:
Compute
Use components in socket_zmq
Implement scroller using slides.jquery.js (WIP)
loop & up unit test

add loop mod with rewind() and update unit test. secure access memory.
Implements validation javascript for swapping out access settings
Don't pass variables by reference, for PHP 5.4 compat
Fixes "create a new one" link
Readme update
Various fixes for global variables, template loaders
Added get_many
Fix clients-memory.txt

* Add extra images to the OS X section
* Update existing image (higher resolution)
some layout improvements...
cleaning junk
Configurando o JUnit para Netbeans 7.1.2 -> é necessário fazer download do plugin do JUnit
Criando as primeiras classes do sistema de Carrinho de Compras
Added my resume
Moved css' to their own subfolder
Added CNAME for www.canb.net
Initial commit

Consisting of my old YarnCraft site with some desparately needed
updates, plus a page that points to other stuff I have on the web.
Octopress init
Site updated at 2012-07-30 13:36:16 UTC
release 3.0.5

* refactoring into multiple modules.
moderate progress on provide a /_oauth/access_token handler

This doesn't work yet, but is closer.

Driving this by using client code and filling in the blanks.
Joseph Bodin de Boismortier: Triosonate in G, 1. Allegro completed.
docs: documented the new ngx.thread API. also fixed the __newindex metamethod definition for catching writes to undeclared global varaibles in a Lua module.
Undid the mistake with the background color, changed selection from boilerplates horrible pink to a very Yeti blue
update README. Now it contains a Notes-section.
support for form errors.
Working on 0.4.X and removed simple_emitter
random flipping and Departures obj
Any silly little change so I can sync
MINOR CHANGES
Removed unused param deleted in iterator.
migratign posts
Rewrite Plugin loader, File view improvements

 - The Plugin loader has been mostly rewritten
    - LuceneFieldPlugins do now have a purpose property that is unique(currently the field name)
    - getMultiplePluginsForPurpose removed
    - At startup it is validated that there is only one plugin per purpose and
    type
    - New method getAllPluginsOfClass
    - Base plugin interfaces are now annoted with @PluginBase for loading and
      validation purposes(unique purpose per PluginBase)
 - File View improvements
    - Better fallback handling when errors occur while inserting code
      navigation links and while hightlighting(Issue #60)
    - Move sidebar to the right side
Fixed refreshing problem with IndexSearcher
PropertiesManager not yet refreshed
Added CRF Users feature
Separate parents into males and females
Add start of page 2 of breed wireframes

Currently can't go back to parent page.

Also we need to show offspring alleles, and keep
top bar where is is
move non-functioning breed top bar out of breed div
Add chromopanel for offspring; make offsp-controller non-array
Get buffer content in sublime did not handle line breaks
Revert "Defined the Hamcrest dependency as a package and require it"

This reverts commit a11b5e19e118aeff8af5cbeedca026dc755673c7.
Created a package based on the pear package
Excluced the test folder from the export (so it will be ignored by the composer install
Merge pull request #12 from cristi23/master

updated setup.py and fixed bug with PDF exports
Looping says doesn't work, switched to self redirect
basic pagination added
basic pagination styles
merge @nathenharvey's changes from origin/magic_shell_environment
Initial release of rabbit-in-a-bottle
+ ‘Chat/#chat.js#’
Add options.spiderfyDistanceMultiplier, allows making spiderfied markers go futher away. Fixes #100
Document spiderfyDistanceMultiplier
Update build
Starting on spidifier based on https://github.com/jawj/OverlappingMarkerSpiderfier-Leaflet (Thanks jawj!)
Gotta be sexy :)
Spiderfier basically done. Need to add a non animated version for suckers
move widget javascript
cluster and move widget css
navigation tweaks
To-FIX: bug in delayed jobs
modify undo function in split feature
Site updated at 2012-04-16 05:26:48 UTC
Der Zustand des Lichtschalter wird jetzt gemerkt
add a skeleton script using nova service framework
* fixed pymongo imports with fallback to older api
Merge pull request #132 from endyman/pymongo-imports-fallback

* fixed pymongo imports with fallback to older api
Added initial set of constants.
Added more constants and some initial functions.
Möglichkeit auf index zurückzugehen hinzugefügt
Auswahl-Seite (JSP oder PHP) hinzugefügt
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
Newlines in autobiography.
Updating app.net credentials and code highlighting
algumas alteracoes pequenas
Generated rails best practices output
Edited with RBP
Generated new rails best practices output
First HTML page.
DiskFile allow_path to layout schemes

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs/naaya.envirowindows@19145 a0171fae-0946-0410-966d-b1775066cd26
Move developer updates check out of MainActivity

Summary:
This moves the check for new updates from our build server out of the
`MainActivity` class in an attempt to clean it up.

Test Plan:
Compiled in both dev and non-dev modes and successfully ran in
the emulator.

Reviewers: jcarter

Reviewed By: jcarter

Differential Revision: https://phabricator.edgesysdesign.com/D34
updated cis597 page
Add commit message here!
Add commit message here!
Add commit message here!
Delete Caches
Making compare_req_resp output more readable.
Adding Boolean filter operator + unit tests.
adding date serialization
Add test for UnicodeDecodeError in PossiblePolls vocabulary when we have a poll with umlauts in the title.
Octopress init
Site updated at 2012-12-24 09:01:02 UTC
fixing feature pickling
Guzide Insan
incorporated changes from r38 of my fiddle (http://jsfiddle.net/enricopulatzo/CY37S/)
Correcting errors on README
Minor fix to script 0047

Set IsAllowCopy='N' on WithholdingAmt Column.
Some more cleanup, getting some possibly valuable stuff into my working history
Inserido testes para itens
Ïnserido o paperclip no projeto
Node plugin - BUILD_ID=Jenkins-let-me-spawn added to bash scripts
DEP-9 : Update 3rd party dependencies to match GateIn 3.5 + JCR 1.15 needs
Jenkins build.gradle files
added class for empty list text
discount wording change
Add README.md inside script as docstring

Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Fix source folders
add more things to the POC
add article openmeetings customannize
MergeParcial
Adicionado animate, padronizado a fonte dos campos
Merge branch 'master' of https://github.com/andersonaguiar/fake_placeholder

Conflicts:
	index.html
	js/fakeholder.js
Added felix's test_alloc work.
Merge branch 'qrivers' of github.com:felixyeung/ucsc.cmps111.asg3 into qrivers
Update tweet text
stupid typo
Fix update button, add GA, Tweak so pledge / vote tweet text is correct
typo for textarea styles, line height for leaderboard
capitilizing the first letter, we are not animals
update typo in style sheet
added unification of accelerometer values on ios (based on android values)
stubbed the heart of the algorithm
inc thermal expansion+config
latest icons issue #109
Added a listener on the AlbumLoader progress property to show the progress of the loading on the statusbar.
Merge branch 'master' of https://github.com/fossfreedom/coverart-browser into entryview
timer class
add timeout for when no coversearch providers issue #89
Teams have been updated to deal with the changes in Arianrhod and Phoenix.
Gear Bag ready for HTML5

Was offline when making change, so for now it saves as an array
Removed procmail strstr benchmark.
use sqlite3 as default, use django default auth backend, remove gunicorn app, fix bug in meeting.html tempalte
FIRST UPDATE
Had wrong order?
Add 'rake' to Gemfile for Travis.
add shsz by github repo
Added header and source for rtpmon
Configure switch to enable/disable rtpmon
init, command line options handling
initial rtpmon support (init, cl options)
Call rtpmon_dump_sample every dump_interval msecs
"-M" implies "-z rtp,streams". rtpmon.error can be empty
Sample dumper
Changed opt parsing style (didn't work on Linux)
Added/fixed bits here and there
Added MyXxxListFilter and other improvements
Added support for human-readable choise values for colored fields
Fixed PrivateIface.nr
lenght dependance work
Change comment code
1.0.1 fixed bug in taglib crm:logo where tenant.option.logo was not correctly specified
1.0.2 Added timestamp tag.
Admin menu is now hidden until a tenant is active.
Revert "ARM: 7011/1: Add ARM cpu topology definition"

This reverts commit b0cedca24d7b11cbde0d67deb711d5741c0b257e.
Revert "sched: Ensure cpu_power periodic update"

This reverts commit 4f1dd1c0c82d060df1a85c9f034a23b741b7ec83.
mali: a tiny cleanup
Revert "cpufreq: add lulzactive governor"

This reverts commit 3e15c48f33827290009ba7e588894a3c34e34076.

Conflicts:

	drivers/cpufreq/Makefile
Replace jobject to void * in CCxxxxx.h files. (remove android dependent portion).
Also remove userless or android dependent headers from CCxxxx.h files.
Fix minor bug.
Release 1.5 of frontend-common
add x86 prebuilt libs, and make multi-arch friendly
Shrihari:Changed the screen for entering the bbp information
answering correctly
maybe i jump to conclusions too quickly
Added handlebars and attached to the node api
Site updated at 2012-12-12 01:01:19 UTC
Octopress init
Site updated at 2012-12-13 16:23:06 UTC
preventing startup problems
addingMissingCm7.MIUI.files
propaby fixed sigv within BoolMatrix
added color evolution to calculate the best set of different colors
Removed depedendcy on username being 'centos'. Absolute path to .chef is required like /home/centos/.chef not /home/centos. ssh.SSHException is caught in is_ssh_ready()
Trying out new method to center gripper
Add HKS Library website
Hide the left tabbar. Cleanup.
check the actual filename, not the spec filename
Change from numbers to bullets in README.md
removed version from lib/DBIx/Class/AuditLog.pm so that distzilla
automatically puts in the version