labofsahil/github-event-dataset-2012 huggingface dataset:
first commit
first commit
	modified:   synch.cc
	modified:   synch.h
First Commit - Lock Variables
Condition Variables
Cond. Var. using Semaphores
Practica 1
Merge http://github.com/juliandt/nachos

Conflicts:
	Makefile.dep
	bin/coff2noff
	bin/coff2noff.o
	filesys/Makefile
	network/Makefile
	test/Makefile
	test/halt.coff
	test/start.o
	threads/Makefile
	threads/interrupt.o
	threads/main.o
	threads/nachos
	threads/preemptive.o
	threads/scheduler.cc
	threads/scheduler.h
	threads/scheduler.o
	threads/stats.o
	threads/switch.o
	threads/synch.cc
	threads/synch.h
	threads/synch.o
	threads/sysdep.o
	threads/system.o
	threads/thread.cc
	threads/thread.h
	threads/thread.o
	threads/threadtest.cc
	threads/threadtest.o
	threads/timer.o
	threads/utility.o
	userprog/Makefile
	userprog/addrspace.o
	userprog/bitmap.o
	userprog/console.o
	userprog/exception.o
	userprog/interrupt.o
	userprog/machine.o
	userprog/main.o
	userprog/mipssim.o
	userprog/nachos
	userprog/preemptive.o
	userprog/progtest.o
	userprog/scheduler.o
	userprog/stats.o
	userprog/switch.o
	userprog/synch.o
	userprog/sysdep.o
	userprog/system.o
	userprog/thread.o
	userprog/threadtest.o
	userprog/timer.o
	userprog/translate.o
	userprog/utility.o
	vm/Makefile
Merge pull request #33 from jun9/myii

Fixed issue: Invalid images and script file paths
Add modules folder to the import path for the default Yii config file.
Fixed issue #6491 - Modal dialogs in attribute control do not close after use or reload grid
Dev - some new translations required
Fixed issue: save button doesn't show in URL Parameters dialog

This works, but we might want to look for a better solution.
https://github.com/LimeSurvey/LimeSurvey/commit/9351790fc8717109f832cb8d967f5d5fa39384dc#commitcomment-1722014
Fixed issue: URL parameters for non-subquestions don't save properly

Database tries to insert the literal 'NULL' which is bad.
Merge pull request #34 from aaronschmitz/Alter_config

Dev Add modules folder to the import path for the default Yii config file.
Updated translation: German by c_schmitz
Updated translation: French (France) by BenoitBouvarel
Updated translation: Italian by lfanfoni
Updated translation: Norwegian (Bokmål) by peterhol
Updated translation: German (Informal) by c_schmitz
Release 2.0RC9
Fixed issue: Default values not saved for certain question types.
Fixed issue: URL parameters not rendered and saved correctly.
Fixed issue 06447: Question number doesn't display properly when the survey is refreshed.
Fixed issue 06484: EM sessions misbehaving

This line should fix the majority of the session troubles with EM because setting the survey forces EM to reload if the surveyid has changed. I still don't think this is quite the right approach, however, because the original survey is reset. I think we should work to move all frontend session variable in to different session arrays (each with ID survey_######) so that two or more surveys can be taken concurrently without issue.
Updated translation: Italian by lfanfoni
Fixed issue #6478: Unable to import excel survey
Dev Fixed incorrect URL description reading in Excel reader
Fixed issue #6496: Server error when changing question group for a question
Fixed issue #6495: Version shows as RC8 on the RC9 release
Updated translation: German by c_schmitz
Updated translation: Italian by lfanfoni, alesarrett
Updated translation: Japanese by nomoto
Updated translation: Norwegian (Bokmål) by peterhol
Updated translation: Thai by c_schmitz
Updated translation: Chinese (Simplified) by jun9
Fixed issue #6481 - Filters showing all text responses
Fix issue: Missing translation of some fields
Fixed issue: Undefined variable: dv in check_view.php
Updated translation: Turkish by kayazeren
adding mustache docs
test/fix for issue #95
Merge pull request #136 from dimaf/master

test/fix for issue #95
Changing jquery/view reference to can/view
Reworking console.log wrapper in fixture because console.log.apply throws an error in IE8 and IE9
Fixed JQuery Validate. The passwords didn't match each other. Had the wrong ID on password_repeat
navbar updated. skeleton for summary-view layouts and containers in place

the summary-view containers display a summary of the given topic e.g.
activites. From that page specific activities can be chosen and then
you go in this scenario to the "view" page. In the final version this
is all dynamic so each "view" page is a separate activity page
tooltips in social-panel implemented

renaming files and references
Built for anybody editing options done
continuing building the OIP framework. Focus on the control panel
follow up to 4c262f031002aa7a0a76a7cd5f607c42b178ad79#L5R790 named the
resource by what it defines. 
fixed whitespace indentation of imported jquery ui lib
renamed touch-punch to touchPunch

--old name was messing with resource defined name
updated volume change comment 
make sure doneCallback is a function
make sure kalturaIframe is resource managed .. 

--additional optimization would just inject it directly into the iframe
.. but will leave optimization efforts to 1.7
comment out setupJsAPI while its not being called
use json_encode to send settings when in js, code comment 
follow up to 170906d694b3af7680e3975710d5ef362bd0dc73 use .data instead
of global config
set source of player on init

-- fixes iPad native controls
-- adds test for disabling iPhoneShowHTMLPlayScreen
updated test name disable show html play screen 
Merge pull request #111 from kaltura/iPhoneShowHTMLPlayScreen

IPhone show html play screen
initial work to use direct embedPlayer call ( instead of dom ready bind )
adds basic support on page playlist
enforce a base size 
Merge branch 'master' into onPagePlaylist
some white space cleanup
adds support for jcarousellite.js to playlistOnPage
basic clean up of on-page playlist
fixed secondary plugin updates on pretty docs, playlist scrolling fixes
some layout fixes for vertical and horizontal on page playlist layout
fixed jump to method for carousel scroll
get kdp entryId from .entryId in playlist data provider 
make sure video element has correct source at play time

* unbind ready to not show player read over and over again
* empty out existing sources at update source time
* fixed on page plugins loadingPolicy and usage of facade plugin
workaround. 
Merge pull request #230 from kaltura/onPagePlaylist

On page playlist support
operator== shortcut for "this == this"
merge
CI: run tests w/ cmake
CI: run ctest w/ -output-on-failure, #113
Further optimize operator==.
Related to #112.
Merge branch 'master' into super_ptr
Turn on COW for Pointer, Structure and IntegerContainer.
Merge pull request #846 from karlnapf/master

More work on kernel selection for linear time MMD test
added get_delete_data() method
moved getter and setter for kernel to the header file and made it inline
updated errors messages
temp state of work, doesnt work/compile, but need to fix a broken build now
another major bunch of changes temp commit
removed memory leaking SG_REF
various fixes, now first working set of kernel selection classes with new multiple kernel style methods
added example for kernel selection for linear time algos
empty line fix
read more button
Merge branch 'local-dev'
Added F4 to swap src and header
Merge branch 'master' of github.com:kayleg/dotfiles
exec bundle update
exec bundle update for jruby.
sl/prototype: drop code handling DLS peers
sl/sym{abstract,discover}: drop code handling DLS peers
sl/symjoin: rename joinObjectsCore() -> joinObjects()

... and drop the original implementation of joinObjects()
sl/symjoin: big cleanup in joinSegmentWithAny()
sl/symjoin: cleanup in insertSegmentClone()
sl/symjoin: initialize minimum segment lengths on the fly
sl/symjoin: unimplement mapGhostAddressSpace()

... and dlSegCheckProtoConsistency()
sl/symjoin: unimplement the 'bidir' arg of joinData()
sl/symjoin: unimplement the debugging facility of joinData()
sl/symjoin: squash joinData() and joinDataReadOnly()
sl/symseg: unimplement segClone() and segPeer()
sl/symseg: unimplement dlSegPeer() and dlSegCheckConsistency()
sl/symutil: unimplement objClone()
sl/symutil: refactor isAbstractValue() -> isAbstractObject()
sl/symutil: eliminate an unnecessary dynamic_cast

... and move the implementation of isKnownObjectAt() out of the header
sl/symcut: initialize minimum segment lengths on the fly
sl/symdiscover: require valPrev of a DLS to have a target
sl/symdiscover: fix mistakenly inverted polarity in digBackLink()

Technically, the polarity does not matter, however having next/prev
assigned in the same order as in 'struct list_head' makes the plots
easier to follow.
Added setting for Android devices.
File path changes to azure blob storage
Same correction with topo Object .
from study
Merge branch 'master' of github.com:kevinleng/study
dartdoc: tiny arg rename
finished the chunk command codec in simple way.
Finish layout and routes-corrected
Add Guardfile for auto-running of tests.
Merge branch 'master' of github.com:khueue/prolongo
Merge branch 'report2'
database first atamp
Latest matches
Remember me parameters.
Cool fade for ladder page tabs
merge from hanbo/master
Case result done
revert .classpath and setting files.
Add opBuilder and KbPage controller.
KbOperation half done.
KbOperation finished.
Solve merge confilct
Performance score inheres in the agent; is arbitrated, however, by the environment?
Set the second (third, and more) Firefox window to be floating.
added links to Member, removed 'education' cause you can't contribute your education
first commit
Improved the HTML structure

Modified the structure of the HTML in order to make styling with CSS a
to easier.
Fix README in gemspec... again
added more extension methods to allow a block to be used in place of a Camel Expression
see changelog.txt
see changelog.txt
Merge branch 'master' of github.com:kopimi/FPMobile

Conflicts:
	changelog.txt
	www/js/fp-api.js
	www/style.css
Import rewrite finished. Ready for release.
Job class
motor driver layout
Improve contour label in plot
Improve colors and labels
Improve legends
Explode greater piece in pie chart
Improve contour webpage visual
pridan jeden cvicny radek :-)
Updated translations from CKEditor Translation Center

git-svn-id: http://svn.ckeditor.com/CKEditor/trunk@7509 da63caf2-3823-0410-a1e8-d69ccee00dfb
#4045: "Field Name" Column in sample_posteddata.php is to narrow.

git-svn-id: http://svn.ckeditor.com/CKEditor/trunk@7510 da63caf2-3823-0410-a1e8-d69ccee00dfb
vim設定修正
Pulido Checkstyle añadiendo constantes en proves.
changed the if conditions, template now loads restaurants. however there is an error with the star displays.
Merge branch 'master' of github.com:ktseng/Diabeats
modification du main, il gere maintenant une Base.
SQL multi-Table operationnel sans clauses WHERE
ajout d'une methode getTable
RVM and wxWidgets setup
changed game.ml draft phase
*) fix a minor bug....
better error message
add main reference
fix nil date bug
Fixing a bug that would stop the script execution before the laravel.done event has been fired for php-fastcgi users

Signed-off-by: Koen Schmeets <k.schmeets@gmail.com>
Reverting Symfony's Response class to previous version

Signed-off-by: Koen Schmeets <k.schmeets@gmail.com>
Extending Symfony's Response class and adding & calling the finish method

Signed-off-by: Koen Schmeets <k.schmeets@gmail.com>
Calling the finish method on the right object
Adding comment to finish call
Defer URI language support to L4.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Merge pull request #706 from Vespakoen/patch-1

(profiler doesn't show up) laravel.done event doesn't get fired for php-fcgi users
Added Command::run() to the documentation for artisan tasks.

Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>
Merge pull request #1105 from spencerdeinum/master

Add Command::run() to artisan documentation.
Merge branch 'staging'
increment version.
Made DownsampleFactorMax.out_shape work correctly with tensor variable.
Update GLC_lib project structure :
 - Add Examples
 - Move GLC_lib src file into src subfolder
Added Authenticated User interface.
exclude build files from repo
more drop down collapse for the guides
put in normal units for table 1
Set separate color schemes for gvim and vim
Added ability to read .zsh_config on cwd
Updated README noting Git submodules.
Updated isomap stuff, to use less memory, Didn't think that would be a problem again.
updates request handler
adds in AWS module
Add Google auth
Add logout link
rm 1and2
Oops, didn't get the __linux makefile quite right after the SVN->GIT switchover
Better documentation of map/reduce functions
Try to use smaller lines for the layout
Change the magic constant
Changed jndi to rebind.
Abstracted RiakClient class and using IRiakClient with HttpClusterConfig
Added json-file for riak node config
Merging RiakStorage
Samples: Fix compiler warnings in fxload

ezusb.c: In function  "ezusb_cpucs"
ezusb.c:163: warning: initialization discards qualifiers from pointer target type
ezusb.c: At top level:
ezusb.c:193: warning: no previous prototype for "parse_ihex"
ezusb.c:340: warning: no previous prototype for "parse_bin"
ezusb.c:377: warning: no previous prototype for "parse_iic"
ezusb.c: In function "ram_poke":
ezusb.c:451: warning: enumeration value "_undef" not handled in switch
ezusb.c:491: warning: passing argument 2 of "ezusb_write" discards qualifiers from pointer target type
Spider replaced with Simpler
dict
httplog update
copy theme mortalscumbag to lime
Update README and fix pom url so points to data.linkedin.com
added DirectorDistance
enabled director for DirectorDistance
added external_features flag for DirectorKernel
polymorphic return for shogun::CFeatures*
added missed methods to DirectorKernel
fix in DirectorDistance example
fix compile error in java modular
Moved liblinear MTL to transfer folder and undo unnecessary stl includes
Merge branch 'director_classes' of git://github.com/gsomix/shogun
fix compile error in csharp modular
Added more fine-detail interface for onlinelinearmachine
fix compiling warning
Added online liblinear example
make online-liblinear able to train example-by-example.
remove comments.
Added basic stuffs for tree-style classifier.
fix compile errors.
Added a simple base class for multiclass machine.
derive tree-machine from base-multiclassmachine
Skeleton for Conditional Probability Tree.
committed 0.3.5-2 (rc1) source
committed 0.3.5-2 (rc2) source
added .travis.yml for auto build / test
wrote the questionable 'popular_people' endpoint
Added option to show or hide modes.
ENYO-1315: temporary fix to only do event reassignment on desktop Chrome, not on device.

Enyo-DCO-1.0-Signed-Off-By: Ben Combee (ben.combee@palm.com)
indent code block so it will display as code
lnt.util.ServerUtil: Call proper constructor function.

git-svn-id: https://llvm.org/svn/llvm-project/lnt/trunk@157945 91177308-0d34-0410-b5e6-96231b3b80d8
Added styles to hide thread until CSS loaded, made closing thread remote
1. 提示信息相关的代码调整；

Signed-off-by: anlicheng <244108715@qq.com>
cartID writable
Add tracker for Bango analytics (http://bango.com).
Removed some hardcoded file locations - all locations now explicitly controlled by the server_settings.php folder.
Signed-off-by: longshot902 <longshot902@gmail.com>
Simplify constructor in JsonArray
small bug fix for general.js bugs in the toaddrs, added more queries
Namespaced templates
new C tests
c lang definition modification
socket?
create "Undecided" group
join/leave/team etc. works
Make "enter" a no-op when user is already in a group
bashrc updates for Ubuntu 12.10
Add touchpad_settings.sh
add xml stuff in dev help
Merge remote-tracking branch 'origin/master'
admin page change
..
...
Sigh, ruby support still messing up screen redraw. Switch to ctrl-p.
Fix mappings
Change keymap
salon params table design
disable適用
Header nav-bar updated and logo added
zoj1796,so easy.
Use $app['db'] instead of $conn and add autoinc

`$conn` is not `$this->conn`and is identical to `$app['db'].
Moreover, column `id` must be auto-increment.
Removed Masonry source file

It's now included in plugins.js
add redbull the red edition
+add_category_list
More work on topic game
removing the places file from the repo
correct player-in-map search after  rewrite MapObjectsStore. seems old method obsoleted.
Implemented testMultidimensionalArrays
Made testMultidimensionalArrays work
Added testNullValues
Bad
Sync .js loading.
pull in top level glob and generic-pool, update bones and underscore
Fixed clock interrupts
add msg class
fix #3070 - merges seemed to have removed code that handles right click on files palette
#1963 #1969 put back assignment
Parse/ignore <?php...?>, which is part of #1967
make the data storage backward compatible
Move MODULES_OVERRIDE from make.conf to my kernel conf.
changement MY_Model
Merge branch 'master' of github.com:marxys/Sandwich
WIP
Brenner
merge
Add merge
WIP
WIP
types update
merge, render fixes
fix DateTime bug
add render tests
fix for new multiarg
merge
multiarg fix
remove abort from liberty
WIP
fix Convert report
fix balance reports
WIP
move DateTime out of parser
fix posts parser
Rename refactored ui2 package to ui
Rename refactored ui2 package to ui
Changed Future<void> to Future<WriteResult> in WebSocketTransport
updated for the hashmap instead of the int[] for commands
fixed compiler on disjuntion
mavgen: added types from mavlink_types.h
mavgraph: always display seconds
added mavlink_uart_resend()

useful for forwarding MAVLink packets
pymavlink: fixes for MAVLink 1.0
fixed mavlink_uart_resend() build
mavutil: wait for another VFR_HUD to get home altitude

this fixes a race condition in the home location
pymavlink: fixed HOME message for GPS_RAW_INT
pymavlink: fixed examples for MAVLink 1.0
fixed playback for MAVLink 1.0
added hibernate lib
updated min version, update readme, updated license to mit
Updates to Italian locale file.
Add metadata value for repair material
<GJ> All hail the enum!
Make use of enum
<GJ> MOAR PERMISSIONS!
Put new permissions to good use
Beginnings of RepairManager implementation
Plus more factories for a stronger economy
debugging Hello World in gas/MacOSX
Add NotepadFile to project, not yet used
Add setter for file
Use controller model
Connect controller and model
Add moveToSD option to move currently saved notes to SD card
Check state of external storage dir before moving file
Save notes to /sdcard/notepad.notes/filename
Ensure directories exist before creating destination file
Delete existing file before moving
More robust file checking
Bump version to 0.65
fixed typo in version number
closeAllWindows, closeAllPopupsWindows, getWindowList added to jqWindowManager
type (flow|popup) property, isFlowWindow, isPopupWindow methods added to jqWindow
closeAllWindows renamed to closeWindowsByType
closeAllPopupWindows renamed to closePopupWindows and made as closeWindowsByType proxy method
Merge pull request #5 from 2rist/dev

close all windows features
Update doc/design-specification/GoalManager.md
OPS-387: add a "DevelHooks" plugin that can fidget with the state as needed
wai-eventsource: Minor typo.
Added basecode, and simple auth is working now
Added base functionality
Add description for postgres.app to the download page

Mattt Thompson
Here is that change
escape GUS_HOME variable in setenv creation
added m. thomas
investigation, assay, and study XSLT files ready for ISAconfig

Going to focus on ISAconfigs before final transforms can be made
FGCP: move default cert dir to ~/.deltacloud/drivers/fgcp

This avoids any conflicts with the file ~/.deltacloud/config
aop group call
Moved from scala-tools.org to Sonatype's repository
Fixed a long-standing bug in the JavaScalaMapper, by adding an askOption when looking at TypeTree.symbol.

Also removed a bunch of useless logging.
Use correct version of Equinox Hook for Indigo
Added a test for memory leaks, using the scalac sources.
Incorporated review comments.
Passing to -Xplugin a path containing whitespaces is finally parsed correctly.

Up until now, passing to -Xplugin a path containing whitespaces resulted in
*no* plugin being loaded. That because
``MultiStringSetting#tryToSetFromPropertyValue`` was splitting the passed value
at whitespace occurrences, which was of course resulting in a mess.

The pull request https://github.com/scala/scala/pull/235 in the Scala compiler
has fixed this issue (patch available in both 2.10 and 2.9.2). In short, now
commas (``,``) are used to split -Xplugin value (when more than one plugin is
passed to it). Some adaptation on our side was also needed for correctly
handling commas as the splitting character.

This commit also fix a issue with the way we used to hande -Xpluginsdir value.
Read the big comment in ScalaPlugin.defaultScalaSettings for more information
about this.

As a side note, enabling continuations should now work as described in
http://scala-ide.org/docs/tutorials/continuations-plugin/index.html.

Fixes #1000917.

Integrated @skyluc code review (pull #75) and added a couple of new tests to
check that compilation of a source requiring the continuations plugin enabled,
works as expected.
Added 'normalize' when mapping a type that might be an alias.
Don't print empty lines when redirecting stdout or stderr through the logger.
Make the R script work with https, so one can point it directly to the Jenkins logs and get
a plot of the latest run.
Fixed 1000893. Added an option to stop building downstream projects
if a project has compilation errors.(cherry picked from commit 0b3c20c0ad0cc1bc731f20f065c7b5dcd1b4edc1)

Conflicts:

	org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaBuilder.scala
Pass upstream projects API to the Sbt builder.
Retrieve upstream analysis recursively, on all dependent projects.
Moved the analysis store to the build manager level, instead of the compile run.
Fixed transitive and direct dependencies for project builders.
Added project dependencies test, and refactored some other tests to reuse more code. Fixed #1000894.
Incorporated reviewer's comments.
Removed useless distinction between `hasErrors` and `hasBuildErrors`.
Remove cached jars when swapping the Scala compiler in an existing Eclipse instance.
Added compiler and library version strings in the Report Bug dialog.
Implement code select. 

This allows the Javadoc view to track the cursor, and searching for references of the current method under the cursor. 
Closes #1000735.
Compiler occiasionally throws duplicate error messages and we don't see it because console reporter ignores them.
We have to do the same.
Merge pull request #55 from scala-ide/issue/multiple-errors-1000735

Closes #1000735.
Hienosäätöä
Diffien hakua ja piirtoa
add fast switching between splits
Adding pages for Medical contact info for Accordian list view and Recent Test Results for News Feed view.
Making some minor chages.
Initial support for Maps
Expansion of README
Added drag/drop reordering skeleton
Make some more mock tracks to see better
Enable receive dragging in the Playlist table
update to new commits of twui
master modifies class1
bind backend also doesDNSSEC()
Remove some completion options and describe others.
remove ruby-debug19
Oprava chyby pri stránkovaní na poslednej stránke.
Merge branch 'master' of github.com:mireq/Shakal-NG
If the url is not correct, redirect to today.
scripts to be modified and run from cron
VESA EDID: switch as low-resolution
Documentation de la classe capeur
Documentation de la classe GPS
Documentation de la Classe Humidite
Unosenje formi
Dodavanje forms-a 2.
Koristenje forms-a 3.
Programma's aangepast
-Added explicit formats for date parsing.
Merge pull request #183 from mmcguinn/mmcguinn-175

Mmcguinn 175
Merge pull request #185 from mmcguinn/mmcguinn-175

-Made sessions which contain no valid non-time data be removed from the ...
Merge pull request #186 from mmcguinn/mmcguinn-175

-Fixed typo preventing empty datums from being removed.
primer refactor
Added Customer operations in wolfvillas Handler
Merge branch 'master' of github.com:mndsouza/DBProj
fixup zoomable structure.
New README.md for github project page
made bootstrap-datepicker a submodule, updated to latest version, updates datepicker.scss
Reduced DEBUG output from pwm_write_int_to_file().
Added clarifying comment to global memory map offsets.
Limit callstackdump to max. 16 addresses.
Use full pruss dump from pruss_stepper code instead of short (pruss only) one.
Cleanup and changed 'acceleration factor' into 'acceleration constant' in debug output.
Added debug output for the case that very short ramps are being suppressed.
Added extra decimals to debug output for ramp lengths.
If ramp length is zero, do not queue acceleration/deceleration for pruss.
Added debug flag for PRUSS code.
Fixed debug output: made conditional with DEBUG_PRUSS flag.
Added register and bit definitions for PRUSS control registers.
Improved PRUSS start: Better detection for early HALT instructions.
Cosmetic changes and ecap init now returns status.
Moved detection of halted PRUSS one level up, from pruss_wait_for_queue_space to pruss_command.
Added NRESET bit to control register bit definitions.
Rewrote pruss_halt_pruss code to use new register and bit definitions.
Also only clearing a single bit if needed, keeping the others intact.
Suppress calculations for zero length moves.
Clip starting speed of ramp up move to a maximum equal to the dwell speed.
This gave problems with short ramps at very low speeds.
Fixed acceleration constant. Set it to the theoretical value and keep all calculations as is.
The PRUSS microcode should be changed to accomodate this (c1 calc).
Added magic numbers for code identification.
Added result propagation to from init routines. Bail out if init fails.
tweaks to images & rating widget docs
changes to images & rating widget docs
+ functions to work with JSON
add tmux swap-window
[windoc] Do not try to show a null node in the tree
Add vim-smartinput
Update
Update adblock settings
don't load the ebeans server if the admin isn't using DB logging. Depends on pull 680 to work with Bukkit:
https://github.com/Bukkit/Bukkit/pull/680
fixed VCCIO1 caps
more layout
layout mostly done
Put the android promo box first
Merge remote branch 'sgarrity-fork/bug-763645-fennec-homepage' into dev

Conflicts:
	apps/mozorg/templates/mozorg/home.html
Fixing path to .mp4 version of video -- bug 748035
Merge pull request #69 from davidwboswell/patch-4

Fixing path to .mp4 version of video -- bug 748035
Add note about ES 0.19.9 not working
[bug 752893] Verify minimal install docs
added ability to have a command timeout in devicemanager as well as tests
Implemented deep scope lookups.
Fixes bug 784094 - Update forced versions for correlations for Firefox cycle starting 2012-08-28
Merge pull request #797 from KaiRo-at/master

Bug 784094 - Update forced versions for correlations for Firefox cycle starting 2012-08-28
bug 751654 - ensure virtualenv exists
Merge pull request #569 from rhelmer/master

bug 751654 - ensure virtualenv exists
Added fix for crash_ratio per kairo.
Merge pull request #536 from jberkus/master

Merging fix for crash_ratio as reported by Kairo
bug 720738 - fix fallout from loadDB->setupdb_app rename
Merge pull request #537 from rhelmer/master

bug 720738 - fix fallout from loadDB->setupdb_app rename
(docs only) warn that hbase installs DB to /tmp by default, offer alternative
Merge pull request #538 from rhelmer/hbase-install-warning

(docs only) warn that hbase installs DB to /tmp by default, offer altern...
bug 750748 - call update ADU hourly
use correct name for logging
Merge pull request #539 from rhelmer/bug750748-update-adu

Bug750748 call update_adu hourly 
Fixes based on deployment testing.
Merge pull request #541 from jberkus/master

Fixes to 8.0 based on deployment testing issues.
Another deployment fix to 8.0, from staging this time.
Another deployment fix to 8.0, from staging this time.
Merge branch 'master' of github.com:jberkus/socorro
Merge pull request #542 from jberkus/ed392258

deployment script fixes.
adding proper title fixes bug 751166
Merge pull request #545 from ossreleasefeed/crash-trends-needs-title-751166

adding proper title fixes bug 751166
dynamically changing title
Merge pull request #547 from ossreleasefeed/crash-trends-title-improvement

dynamically changing title
ensure version is set fixes bug 750813
Show 128x128 icons in the devhub (bug 779200)
Added blocked status for blocking packaged apps (bug 794225)
initial layout work for detail page (bug 734435)
Run dupe removal in the correct migration (bug 731639)
Clean up timeout middleware, add client-side option [#161]
24 -> 1 hr
Use the new logger
Attempt at migrating @unity's work
Probably ought to include modernizr
Completely migrate to JS
Agregados iconos facebook y twitter. El mapa en pagina interna aparece rectangular con la imagen centrada, para dejar luegar.
Merge branch 'master' of https://github.com/mrazzari/ux2012
Simplified ShapeGeometry code a bit more.
Updated build.
Added color pass to deferred shading example.
* added custom properties to Object3D
* support custom properties in SceneLoader
* add example which displays custom properties and nested scene graph
Merge remote-tracking branch 'skfcz/master' into dev
Clean up of SceneLoader+properties.
Added i18n support to column headers
use ruby 1.9 random idioms to clean up snortle method
更新Aurora,更新头像,skada回归
MDL-32471 pluginfile.php accepts optional parameter 'preview'
MDL-32471 changing the interface of the send_stored_file()
MDL-32471 fixing the coding style in lib/gdlib.php

The GD functions are listed in lowercase in the PHP manual. So they
should be using this case in our code, too (otherwise, doc autolinking
tools may not work). I did not remove the underscore from the parameters
names intentionally to have the function interface compatible with the
one documented in the PHP manual.

See http://www.php.net/manual/en/ref.image.php
<
MDL-32471 introducing generate_image_thumbnail() function

This helper function uses GD library to generate a thumbnail of the
given image file.
MDL-32471 introducing file_storage::get_file_preview() method
MDL-32471 send_stored_file() now supports the preview option

If for any reason the preview image can't be generated for the given
file (eg we do not support its mimetype yet), the function will send
404 Not Found HTTP header. This will be useful for the lazy loading of
the file thumbnails as the JavaScript will simply ignore such response
and will not replace the default icon for the file.

In the future, a fallback thumbnail generator can be implemented that
would generate some sort of default preview for all files (eg using
the mimetype icon like some desktop OS do).
MDL-32471 preview thumbnails support for activity modules

Activity module's xxx_pluginfile() now accepts the $options parameter
that is to be passed to the send_stored_file() function.
MDL-32471 preview thumbnails support for blocks

block_xxx_pluginfile() now accepts the $options parameter that is to be passed
to the send_stored_file() function.
MDL-32471 preview thumbnails support for other component types

This commit affects mostly qtypes. Other standard components either do
not have pluginfile handler or have been already updated to the new API.
MDL-32471 remove orphaned preview files via cron
MDL-32471 purge_all_caches() removes all generated preview files
updates:
- added export options for dataTable
adding presence validation to email
cleaning pep8
switched to FXML based cell value handling, added some columns to team table
Had join_rm plotting backwards
Added initial project of game logic. pj
북마크 API 앱 및 jsonrpc 템플릿 설정 추가
ROOT_DIR 설정 추가
deploy to production - version bump to 0.0.5
Swapped jslint for jshint
Fix jshint issues in node code
Remaining fixes for jshint on the client side code
Delete soda and selenium code
delete superagent dep
Enable strict checks
Do the jshint checks first as they are fast
more jshint checks
Partial dates - basic schema and tests
Added date formatting
Rename, and extract the functional code into module
jshint suggested changes
Refactor tests, and don't wait so long for connections to close
Add validation for the partial dates
2012-03-22-02.30.00: src/lib/std/src/nj/runtime-signals-guts.pkg: Cleaning.
Bewegungsbefehl für gruppen -> parallelverschiebung (Issue #26)
Merge branch 'master' of https://github.com/mzda/celltastic
Исправлено [close-991958]
omap3isp: 10MB workaround buffer is only needed while the ISP is in use
Updated with Parallel code

Copied all parallel code into repository
Updates with Esent additions
Added .gitignore
Latest Updates Esent complete Code Analysis and Style cop warnings fixed
Merge pull request #1 from nanderto/Parallel

Parallel
Added custom command support
Fixed german umlaut support
map.md should not be moved to the target
Revert "Don't use "cp" for copying files/folders into ${D}, use insinto/doins -r instead."

This reverts commit 1c3745a31ad9e256164dd82bd8720d28c9158325.

Original code was actually cleaner.
Updated JAVA_HOME grails reference due to OSX Lion change.
Check for ftp too...

Signed-off-by: Nick Campbell <nicholas.j.campbell@gmail.com>
add submodule for private cookbooks
Operator calls on objects of a child class can now correctly call the operator declaration for the base class
Merge pull request #423 from shamanas/refFunc

Operator calls on objects of a child class can now be correctly resolved to the operator declaration for the base class
newrelic gem change
Initial Push
initial
Added pg
Gemfile fun
Added a Table to Display Connections
Initial Push
redis config
Redis Config
Redis Config
Redis Config
Redis Config
release v1
release v1
added footer, cleaned up cosmetics
Update config/initializers/geocoder.rb

Removed Server Settings
added geocoder.rb to .gitignore
Removed Local Readme
Merge remote branch 'origin/work' into home
^ Getting overtime efforts to show up as such
Merge remote-tracking branch 'origin/home' into work
Merge remote-tracking branch 'origin/work'
Merge remote-tracking branch 'origin/master' into timeowl.perthweb.local
Fix call updates in request loading data
Add action constant for request data service.
Fix contact trader list to load according to currentpage index.
Add on replace statement for Contact schema
Add support sync for data from provider to service.
Minor fix to load default contact data when DEBUg mode on
Add empty method for contact creation object.
Check null parameter to avoid NullpointerException
Utility for Account authentication
Change Authentication mechanism
Our dialyzer-based search engine finally dialyzed :)
fixed infinite loop bug
Parser example implementation
First Commit
Merge branch 'master' of https://github.com/newca9h/theMENU
Use more durable FFI::Library::LIBC constant.

* The current code uses a magic literal constant "c".
  This breaks under my archlinux. I need "libc.so.6".
  The FFI::Library::LIBC constant is especially designed
  to take care on these differences as it delegates to
  FFI::Platform::LIBC that is in my case the "libc.so.6".
Merge pull request #20 from mbj/master

Use FFI::Library::LIBC in favor of magic "c" constant when calling ffi_lib.
service config move
do need webtest
Added Two Epic Killer Verbs
foo
Merge branch 'philip', remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
added blurbs, features, and featurettes
Merge branch 'philip', remote-tracking branch 'origin/master'
merging
merging andy
Prevent possible security exploit see Respect/Loader#6

While doing development on Respect/Loader a massive security vulnerability was discovered which has the possibility to have huge repercussions as it gives any include file scope to hijack the autoloader.
see Respect/Loader#6 for more information.

This fix will also prevent an included script from auto-outputting anything as a result from the include call which will prevent any unwanted source code from ever being revealed as a result of faulty tags or phising for information when a script manages to be included by someone trying to exploit the application.
typo corrected on stam2hbb button
move queue indicator to the right
must setup transaction around Job.lock and #work
cleanup Moves on start of worker
upgrade ruby to 1.9.3-p194 to get rid of encoding issues with Dir.glob
links to changes and updates
can browse github issues from the menu
Merge branch 'feature/git-changes' into development
move OS variable to init.el
set processing-java path on arch
enable BIGHUGETHESAURUS
conf file didnt update?
Some minor changes
Merge branch 'master' of github.com:nirmalyab/TBNJR

Conflicts:
	src/MouseData.R
trying to get more script stuff to work
Update excludes.
Add manifest version.
Changes + added ManyToMany UserProfile
Merged conflicts
not commit second
update aliases in gitconfig
expand "git l" alias for better osx support
Picture added people

pict size: 100x220
Moved copy/pasting logic to the Node class.
Update .ndocrc and make publish
Fix name of the dir in generated font
Fix brandico remote URL
Color diffs are much nicer.
delete Formula
Small edits to buy test case
changed to container-based versioning and fixed tests

Change-Id: I89f5f2fcb318d59b019effa3b73cd0eb226118ad
Fixing whitespace (s/tabs/spaces/g)
Update notes for submitted changes

* contrib/openocd.udev: fix warning
Add MPSSE communications layer for FTDI chips

This is a higher-level libftdi replacement for use when implementing
protocol drivers for FT2232, FT2232H or FT4232H. It takes care of device
open/close and, unlike libftdi, also MPSSE command abstraction, command
queueing, buffer handling and return data parsing.

The FTDI device is accessed through libusb-1.0 in asynchronous mode.

Change-Id: I051adb574dcc39f8ca9cd7f6dbe6ae4aeea5f4c8
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/451
Tested-by: jenkins
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Reviewed-by: Peter Stuge <peter@stuge.se>
target: enable TARGET_EVENT_RESUME_* events

Change-Id: I7d8378f9f34c6674db8c8b29d1a961389578e921
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/640
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Tested-by: jenkins
Reviewed-by: Bill Traynor <wmat@alphatroop.com>
Update notes for submitted changes

* flash: stm32f1x: Pad odd byte writes early to avoid 16-bit writes
Update notes for submitted changes

* stlink: add generic open error routine
edit and add buttons
Example assembler source codes
1. refactoring dispose, move to bottom of each class
2. clean itself before call super (backtrack)
3. more aggressive remove everything from memory
4. add removeShader method for manual dispose from ShaderCache
add best practice example for dispose,
add isDispose flag
unbind camera reference
Merge pull request #55 from katopz/master

all about dispose. Thanks!
Fix incorrect Markdown format
add sf2
NXP-9270: Adding cm.syncro.delete.mailboxes property to configure if the mailboxes belonging to deleted users are kept or not during syncro
NXP-9120
1) Add launch screen. 2) Add app icons.
Use a single connection when doing inserts.
Initial commit of new counties.
One letter typos in poole.py and README.md.
oiptions -> options
Merge pull request #7 from Grahack/typos

One letter typos in poole.py and README.md.
filetype off; coffeescript
Labels in Settings form are more logic
2012-11-27 Upgrade PCGen 6.00

modificati file con nuovi TAG per nuova versione PCGen
riveduti i tipi delle armi e competenze
rimossa cartella copia del srd35
qualche spostamento dei file della vecchia versione srd30old
nuovo prettylst

TODO:
rivedere i tipi delle armi specifiche/magiche - da copiare dall'arma su cui sono basate)
replace SBJson with JSONKit
translate the annotation into English
replace headerbg with shadowed version
Update redirects italian language

Update italian language
fixed typo

fixed typo
Update italian language for Settings module

Fixed some typo and translate
Translate sitemap module

Translate sitemap module
Create italian language for Maintenance module

Create italian language for Maintenance module
Merge pull request #1297 from ChristianGiupponi/2.1/develop

Redirects module italian updates.
Fixed notice in email event when $data['name'] was not set
Merge branch '2.1/develop' of github.com:/pyrocms/pyrocms into 2.1/develop
Added {{ theme:partial file="foo" }} back in as deprecated so as to avoid breaking live sites
Ubuntu improvements
Signed-off-by: big <oksamitnyj@gmail.com>
Add : extra_setup decorator to add some context to a bench execution
Fix : setup keywords
Quickfix: wizard said lets transform those tabs into spaces
Update : extra_setup compiles code, and runs it into custom global context
Fikset refresh og a tagger på titler
Updated spinner code to allow spinner instantiation on an adhoc basis.
Merge branch 'master' of github.com:omersaeed/gloss
Remove references to some unused columns
Delete some unused columns from the builds table
More progress bar fixes
Try moving progress bars
fix typo
fix gs Recordings_Timershift
fix possible gs in movielist
MovieSelection: Fix sort order hints

Sort by date was counterintuitive
tstool: Seek to sequence start when (re)winding MPEG2 streams

This fixes non-working rewinding on a few transponders, and seems to
have no visible effect on streams that already worked fine.
Merge branch 'experimental' 19.2
PVRState: update icons slightly cleaner.
Merge branch 'master' of git://openpli.git.sourceforge.net/gitroot/openpli/enigma2 into pli-import
Merge branch 'beta' of ssh://ks387398.kimsufi.com/enigma2
fix swapmanager and update code
Merge branch 'beta' of ssh://ks387398.kimsufi.com/enigma2
swap manager add vfat support
Merge branch 'beta' of ssh://ks387398.kimsufi.com/enigma2
skin_display: fix HD logo appearance. (was showing on SD channels)
test remove /dev/dbox/oled0 when no display
MovieSelection: Also delete text next to redbutton when trashcan is selected
test2 remove /dev/dbox/oled0 when no display
NumericalTextInput: Simpler and faster

Tuples are more efficient than lists, and a dictionary is way more
efficient and readable than a bunch of if .. elseif ..
Harddisk: Remove unused errorList

Leftover from old mkfs/fsck code.
NumericalTextInput: Add ';' and '%' symbol to all languages

AutoTimer for one wanted this
Windows: remove unused 'deltas' from cm_CheckServersMulti()

Reviewed-on: http://gerrit.openafs.org/7725
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 52f3878da4b8f5356e7799f2659d41cade0dbdee)

Change-Id: I984e13007ade5028989c834d560e3aa9ae657bcb
Reviewed-on: http://gerrit.openafs.org/7734
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: X86 DEBUG Interlocked Or and And

X86 DEBUG builds do not have a native InterlockedOr or
InterlockedAnd.  Therefore, we must provide our own.

Reviewed-on: http://gerrit.openafs.org/7726
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit f4baf7cf99ef52f3ce9d6a7ee577cd9140a8bdc5)

Change-Id: I0fdd34867294f8c3f321636c460c538a862fa001
Reviewed-on: http://gerrit.openafs.org/7738
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: Prevent lock inversion SetFileRenameInfo

SetFileRenameInfo calls MmForceSectionClosed() which can call
back to the afs redirector via the Cleanup processing.  AFSCleanup()
requires an exclusive hold of Fcb->Resource so we must obtain the
lock first in AFSSetFileRenameInfo() prior to obtaining the
SectionObjectResource.

Change-Id: If679eeb107f04153a26659971b7f2455eef97c9a
Reviewed-on: http://gerrit.openafs.org/8603
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Build: link libaudit before util

libaudit depends on util symbols, so link it first to avoid
unresolved symbols.  Include libaudit in the list of libs
instead of making it a special case.

Change-Id: Ide6d5f7e3ce8fd76b504088dcae3110872a87092
Reviewed-on: http://gerrit.openafs.org/6847
Tested-by: Derrick Brashear <shadow@dementix.org>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Issue #135. Move config initialization into its own module. Hard code default Session, Listener and Collab module ids into the cowed/main define signature. This allows build tools/optimizers to find these modules while still allowing custom versions to be configured.
adding new components
merge
Merge branch 'master' of github.com:opencpi/opencpi

Conflicts:
	core/library/src/OcpiLibraryAssembly.cxx
filepush: Stop sending data to mux after thread termination

This caused the hangup on the 8000, when paused, it will block
on write(), so just pressing pause and then jumping would hang.
tstools: Separate internal/external methods, remove unused ones

Removed methods defined but never used. Made methods that weren't
used externally protected.
db.cpp: Fix (?) compiler warning 'return without value'

There wasn't a value near the "return", so I assumed that this was the
intention.
Make it explicit who's using rawfile in "cached" mode
servicem2ts.cpp: Remove unused "cached" mode

Probably a copy/paste leftover.
epng: fix gray type and tRNS chunk processing
SoftwareUpdate: Add timestamp of latest image available
servicemp3: properly find basic subtitle files

the code assumed the file extention was always 3 characters but that
is a wrong assumption. So just base it on the existing ext variable.
add epg key button
Merge branch 'master' of git://openpli.git.sourceforge.net/gitroot/openpli/enigma2

Conflicts:
	lib/gdi/epng.cpp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/python/Screens/InfoBarGenerics.py
Add gravatar for user
Merge pull request #16 from sharoonthomas/master

Add gravatar for the user
Laid the groundwork for messaging.  Messaging now handles onion routing.
Will put in the tie-in to authentication when we implement authentication.
Modified platform with some bits needed for messaging
add self.included to the sorcery
Update "no - Nors" translation. Author: takinsur. Messages: 128. Id: 1528.
Update "ps - پښتو" translation. Author: Herawi Pashtun هروي پښتون. Messages: 70. Id: 1529.
Update "ps - پښتو" translation. Author: Herawi Pashtun هروي پښتون. Messages: 70. Id: 1530.
Merge branch 'master' of github.com:ornicar/lichess

* 'master' of github.com:ornicar/lichess:
  removed web/bundles/ from repo because symlinks unsupported on WIN
removing trailing spaces
minor tweak for selects when the text it is too large
removing trailing spaces
removing trailing spaces in js admin files
moved load styles and script to functions.php + defining var osc before loading js
removing trailing spaces in model files
select category with two selects instead of one
Change to gates; add more test files.
change name to utils.
Add tests for core; delete old file.
Re-org'ed templates and added some new ones.
Removed simple, content template classes and updated others to use new template
names.
cambios ultimos antes de
Start getting automate builds going

Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
metadata db has been merged with jobcache, removing config items
rename Conf var
Merge branch 'master' of git@github.com:paczian/MG-RAST
Merge branch 'master' of git@github.com:paczian/MG-RAST
Merge branch 'master' of git@github.com:paczian/MG-RAST
deleted old upload.cgi, moved recieve_upload to upload.cgi, added scripts called by upload.cgi to Conf.pm
changed tab name, commeneted out plugin widget, added hits column
Merge pull request #30 from jaredwilkening/master

cleaning up Conf.pm - removed metadata db configuration
Merge pull request #31 from teharrison/master

added representative organism table to analysis page
fixed user detection, including star right
final sketches for today
CAMA

Atualizei o BD tb…
added build dialog (accessible from Option and Module dialog)
Merge remote-tracking branch 'panek/coupling' into coupling
minor fix
generator -reducing redundant code
(#3209) Documentation for EC2 spot instances.
fix chrip getfile to open for BINARY access, so that on windows chirp fetch doesn't end up modifying the file. #3355
===VersionHistory:Pending===
Merge branch 'V7_8-branch' into V7_9_2-branch
Merge branch 'V7_9_2-branch'
Cleanup module docstring
Cleanup tests
Rename NotificationType to Event, application_ to app_, and so on
Update README.rst