labofsahil/github-event-dataset-2012 huggingface dataset:
added sourcen for logger2
Merge branch 'master' of github.com:valiton/winston-graylog2
revert back to the previews Version to keep the compatibility to the current logger + added File for the new Version which is compatible to logger2
Fixed control and clean tasks of kdragonflybsd-3/debian/rules.
Unstyled markup for "single story" and "submit a story" page
added ability to read in files
Remove server side death consequences
Add script for player death
Call player death script when a player dies
Added user show page
Added signup page along with logic to sign to database
Done with sign in
Done with signin
Done with sigin
Finished adding user edit, update, index, and destroy activities
Added user microposts
Refactored business logic in server

- webserver.rb -> User#update_attributes_from_public
Merge branch 'master' of github.com:vtsatskin/UW-Don-Tracker
[opencl] 6.12.3 start

Signed-off-by: Ni Qingliang <niqingliang2003@tom.com>
Adicionando estrutura para o grafo
added explanatory comment referring to the Guardian's JSONP API
Merge branch 'develop' of github.com:wapolabs/pyramid_restful into develop
Fixed introscene
pzp network address resolve

Jira Issue: WP-103
Merge pull request #71 from habibvirji/WP-103-pzp-pzp-sd

pzp network address resolve
Use length from most recent read for length check

Fixes reading json split into multiple buffers.
Add some more tests.

Jira-issue: WP-125
Merge pull request #85 from aldafu/WP-125-fix-multiple-split-json-msg

solved issue http://jira.webinos.org/browse/WP-125
在ie浏览器，不开启折叠功能
MVC client
Added Nikon stuff, BlackClip, Scaling
测试

Signed-off-by: wenanguo <wenanguo@dev.gz.cmcc>
Rebase from release/rostopic
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.19
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.19
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.19
Rebase from release/rostopic
+ Creating debian mods for distro: oneiric, rosdistro: groovy, upstream version: 1.9.19
+ Creating debian mods for distro: precise, rosdistro: groovy, upstream version: 1.9.19
+ Creating debian mods for distro: quantal, rosdistro: groovy, upstream version: 1.9.19
empty commit to force travis to re-run (looks like it bugged up)
will rebase and squash this commit later
Localisation updates from http://translatewiki.net.

Change-Id: Iecaef86923bb32e102dd69ec12651824565bc3ed
Merge "Localisation updates from http://translatewiki.net."
Update MobileFrontend to master

Change-Id: I6ac4c172f52fae06783b3115b57cc96bb31715c5
[FileBackend] Actually unset the "conn" field in closeConnection().

* This means that handleException() will actually trigger a new auth
  attempt for the next operation if there was an unexpected error.

Change-Id: I8c651cc57d0967549ec67257078c8e126674235d
(cherry picked from commit 22bc6df81cecaf7588769234b8361e77a34ab771)
Localisation updates from http://translatewiki.net.

Change-Id: I9083fea439c7bf545a7d2971d204513fab51c04c
Merge "Localisation updates from http://translatewiki.net."
added bezel alert to jump to definition failure on double click with command held down
added WCHexadecimalToken and WCBinaryToken to store hex and binary number values for number tokens in addition to their string values
added more modules to mock on ReadTheDocs
edited readme, changed URL to demo
Update messages so it's compatible with Django 1.4
Add ability to use https with gravatar
Merge pull request #1 from bradmontgomery/master

support Django 1.4
Site updated at 2012-12-27 03:28:45 UTC
Clean up paths ending in dashes; allow square brackets to specify only including certain group values
Equipment

-proper shunting of emails
Add first post & CNAME
Playing with the README
Fix typo
Update readme
If working directory does not exist, silently create it instead of throwing an exception
add lpng and lz
renamed:    README.md -> README.markdown
configurable separator for ReadableFor and Readable
Merge pull request #14 from adrx/flagged-enum-customize-separator

configurable separator for ReadableFor and Readable
fix jt.
edit UITableView
edit
Merge branch 'master' of https://github.com/youmumzgit/Cocoa4Android.git

Conflicts:
	Cocoa4Android/bin/cocoa4android.jar
rebuild
Merge branch 'master' of https://github.com/youmumzgit/Cocoa4Android.git
uipagecontrol view added
add PlainTasks + hot key for daily todo
在控制器中获取二级分类的内容
init project
Merge branch 'master' of https://github.com/yuxiaqiao/sites_watchdog
Merge pull request #10 from z0rch/Abracadabra

Abracadabra
fix permissions warning.
Decrease star velocity
Updated namespaces in services.xml
How did a hard tab end up in my code?
Reworked metapackage

- Instead, it now installs git source
Updated packages.json with zf2 metapackages
blog sep 1
Passes the tab contents as fragment arguments instead of static members.
Fixes #1.
stereo: Fix disparity masking in Pyramid correlation

There are primarily 2 things.

1.) Using edge_mask one the disparity masks limits the size of the
valid data that could be correlated. It's over constraining and
deletes wedges of data. I think the original author meant only to
remove data that was near the boundary of an image tile and not the
actual image itself. The commit replaces edge_mask with just a half
kernel masking from the image tile.

2.) Wrote a new subsample mask by 2. This one is a little cleaner with
memory access. It also allows the output to create a valid pixel if at
least 2 of the input are good. Previously we required that all input
pixels be good in order to make the output valid. That had the side
effect of making the mask slowly shrink as we continually subsampled.
stereo: Fix out of bounds access in new disparity_mask subsample

It needed a zero edge extension on the input.
Fix link
Merge branch 'master' of ssh://github.com/zombofant/programmierung
seeing if bumping faraday-stack fixes my problems
switch to faraday_middleware from faraday stack
Merge pull request #1 from naudo/master

switch faraday stack for faraday middleware
Run regexp when building IE test script
test
rm test
update
add ECS key for close !
jquery better than javaScript :D
Merge remote-tracking branch 'origin/master'
Implementiere Grundseite für das ACP
Update google_sitemap_xml.php

- Added 'f' option to gzip command to allow overwrite of existing files.
- Changed getCmsSite() SQL query to match content in CMSFOLDER_USERINFO folder.
- Old Queries can not be changed from URL to NO URL and then saved.

- New Queeries give error

- Update Album gives error
- Changed permission to can make a sym link from the /var/www folder.

- Modified the tracker to take only a limit of photos.

- Created a website to show the galleries.
Added color coded explosions. New field collideable in spatialcomp.
Animation works better now
adds a bunch of assertions and fixes bad division-by-zero error in grid cell width calculation when the requested cell width is larger than the width of the grid view bounds; in which case cap it to the width of the grid view bounds.  fixes code returning zero items per row
removes logging
removes dead code
fixes bug where the current size of the entire grid (calculated from the actual cell size, which was calculated from the desired cell size) is mistakenly treated as the bounds of the grid view and passed to the grid view data causing flush-to-edge cells to not always work correctly before autorotation (reproducible on iOS 5.0 Sim)
Merge branch 'feature/fixing-bad-grid-data-size' into develop
-numberOfItemsPerRow returns at least 1; adds assertions for horizontal mode
Fix for retina updates (_imageViewForView was generated in non-retina resolution)
Merge pull request #122 from augard/master

Fix for retina updates
semantics
Enabled multiple selection
Removed comments disabling _selectedIndex
More cleanup of commented-out lines
Update README.textile to include installation instructions
Merge pull request #140 from kevinlawler/patch-1

Update README.textile to include installation instructions
Ditch hidden project workspace for explicit workspace

That is, AQGridView.xcworkspace.
Make all xcschemes shared
update project files; axe deprecated PREBINDING build setting
Fix possible infinite loop in -[AQGridViewData indicesOfCellsInRect:]
Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'origin/develop' into develop
Description: daily report
Issue: N/A
Onwer: Allan xing
Root Cause: N/A
Lot of codding
- Refactoring
- Add Repository and entities
- Add common Module
- Add License, .gitignore
- Etc...
Added output directory option.
Final update and push for the Bronze App.
make the compiled files compatible with older machines ..
Remove submodule file
info and instruction backgroundpicture & size change
Added mouse wheell volume binding on music and home screens
Added Changelog screen which pops-up at initial install and one time after every update (new release)
moved feedback to abs menu
+subsection Theorie
Systemanforderungen ergaenzt
Updated doc: renewed activity diagrams
Supporting binary string db & collection names.
add info about supported events to services.json
Update of URL
Merge pull request #329 from rkh/supported_events

add info about supported events to services.json
Merge pull request #369 from CodePorting/master

Update for Live URL
Add php and ini support.
Do not forget about version tag formatting.
ENH: Clean up directory creation and BABC memory

An unnessary empty directory was being created.

Explicitly require 8GB of memory for BABC.
ENH: Minor fine-tuning for helium cluster.
COMP:  Minor debugging improvements.
ENH: Add ability to take label volume measures.
COMP: Fixed compilation when string for Build type is blank.
ENH: Made functions conform to ITKv4 as much as possible.
ENH: Bug fix trial in BRAINSCutApply

Minor bug fix in the flaot tolerance compatibility

ENH Trail with label value =255

Trial: Label value for RF

Trial: Get rid of fill hole/connected region

Add normalization comment

Debugging comment: normalization setting check

ENH: Fix bug with missing normalization flag

Minor typo

Plug back in Hole filing and Connected Region Ext.

Minor: Get rid of debugging comments
ADD: Overlapping module
ENH: DownSample -> Resample including upsampling
ENH: Replace shuffle code by module
ENH: Fix Shuffle vector

ENH: Minor type change

Floating Point trial

ENH: Add more message

ENH: float multiply

print more

Fix Type Error

Get rid of unnecessary code (Minor)

ENH: Messages

TYPO

Add more messages

Messages

Debugging code

BUGFIX: vector index was off by one

Get rid of debugging message

vector index message

Test

FIXINDEXBUG
Merge pull request #84 from reginakim/ShuffleVectorBugFixAndLabelOverlapModule

Shuffle vector bug fix and label overlap module
Revert "Toxins, done."

This reverts commit b42d9008479d1506aea466906587970263f17a01.
Merge branch 'master' of github.com:Baystation12/Baystation12
Actual Toxins Stuff
Merge pull request #703 from Hawk-v3/master

Toxins Piping Done
Updated Student Dashboard to be more readable
Only admin can create users
[ZRAM/ZCACHE] Added modules for zRam and zCache
Added tests for cusom routes
Add status validations and tests
Create Huffmann.cpp
Fixed issue # 324 - convert color to gray in morph
got the "camera" working..........
Merge branch 'Camera'
Back to arm-eabi-4.4.3 for now
use the proper $c->req methods instead of accessing $ENV directly, add client hostname if provided by the webserver
seen class takes precedence over normal message list bold, fixes message-not-marked-as-seen on open
routine update
routine update
routine update
routine update
routine update
routine update
added compass, streamlined css files
imported old stylesheets, converted to sass
Dupe support for screens. Doesn't seem to work when saved to a file however.
npc/re/comerciantes/splendide.txt Deletado

Traduzido por LyDe - Encaminhado para o repositório principal.
Endereço:
https://github.com/Cronus-Emulator/Cronus/blob/master/npc/re/comerciantes/splendide.txt
Made modifications to reviewsAutoComplete to make the autocompleter work for the submitter field. Should work in all cases but have some expected test failures to fix. Committing to not lose my work!
Del patch-4.MPQ
Update notes for submitted changes

* build: fix target header overlay
Show a list of available themes for customization
Switch name to NEBRASKA
Made changes to everything
Added a column to display the users' emails.
fix for #114 - test depends on global install
Fix some 'eval' statements not parsing arguments correctly
Added the ability to use colored wool and updated README
Change to s3cmd version meaning -M option in my deploy script is no longer valid
Try to fix unknown XML fields bugging importing
Added Number format and changed HTML message
Basic framework for the beginning of p_client
Updated chatserver
Fix power-off
links again!!
Cleaning up strings

Removing unused strings, moving hardcoded strings into strings file,
reorganizing
Commiting for v.3.0
no jekyll is used.
Updated Test to reflect actual configuration case (this bundle is using arrays instead of Elastica_Type_Mapping)
OpenSCAD: fix translation problems and identation error
renamed Treasure Hunter to Bounty Hunter
30fps default, removed a test spritesheet
mis modificaciones al "gran caso de uso"
agrego mis modificaciones despues de sincronizar la master
Clean up meta processing.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Client Tools support for Windows.

Removed ${OSSDIR} as it was "fighting" the cmake system.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Changes for Management
Name checks in the bin directory
Add ability to change port
Jared's modifications.
Window resize event, threading
Rajout des calsses de tours
bump: v0.1006.27
Four updates:

1) Enabled support for wildcard etag. This allows the caller on PUT to use If-Match: * to match any exiting file.

2) Updated test to handle slash and turned on terminating slash for RemoteVfsManager

3) Added support for deleting empty directories.

4) Fixed bug in MediaTypeMap.GetMediaType not catching if we get a null registry key.
rewrote stl-to-json binary conversion

The code used to parse binary STLs into JSON format was massively
inefficient.  You can now live-render the large Walt STL in <10 seconds
on a decent server, no longer making it unusable.  Complex STL files can
be rendered much faster now.  300-400,000 vertices can be rendered in
~30 seconds (reduced from >14 hours)

-Removed the unused freads (replaced with fseek)
-Used hashmap instead of array_search and in_array
-Removed the fread of entire stl contents for binary files (it is
unnecessary and unused) in json.php and moved this section of code to
its own function
Merge branch 'master' of git://github.com/ncrawford/thingiview.js
bowtie2 2.0.2: New formula
add swat logo
removing sub-module
adding updated uiowa bar
added divider to major alerts drop down
demo.js retrieved from chrome console
checking git
retrieved all files from chrome
extra files removed
Removing extra programs

Signed-off-by: Jason Wengert <wengert.jason@gmail.com>
Merge branch 'Jason4' of https://darklazar@github.com/JWengert/jw-asteroids-454.git into NOMultiplayer
Start on page describing how to fill in base class properties.
Created PagesController and Home, About and Terms pages placeholders.
Added some css styling.
Correct casing of xsd datatypes
Updated comments, demonstrating I can commit.
Removed whitespace.
Replaced download links with link to github.
FLA not needed within HTML folder.
Add d2spr
Add d2spr
Add d2spr
config update for backlight
tommy modified readme
Merge pull request #1 from KaitlinMS/tom1

tommy modified readme
Lingpipe Model (input)
nova: fix for qemu-1.1.0

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Add 'sketch' theme
Next stage.
* web.xml [faces/index.xhtml]
Bug Fixed, Initial Commit
Bug Fixed, Initial Commit
implemented simple Handlebars integration
cleanup
Merge pull request #62 from LivelyKernel/handlebars-templates

Handlebars integration
Switch BasicTestProcessor to threads
but really fuck code pro
Dropdown cu analizatoare + descriere analizator selectat.
Implement Next Button listener + code refinements
Trying to make stackoverflow more obvious and not happen...
Improved some tests and deleted some redundant code
changes to adapt to the ISM restructuring
nice image animation and zooming
Updating Automatic Subscriptions
fix #box, it keeps leaking out of .container.
added some stuff to .footer
changes to the footer, look at comments on #body
Merge branch 'master' of github.com:MattSanford/Let-Us-Spray-
Box Shadow Color

Added the color variable for box shadow
Separator Header

Fixed CSS for the separator line in the logo area.
- Deleted Extra Images that are no longer being used.
- Added a Starter File For logos in the masonry logo area.
Global corrections of a style

Found a style that was designed in multiple locations pulled it out.
Masonry, and Header Graphic

Alignment issue -  when the user is logged in vs not screws up the alignment of the background graphic.
-- Fix the hight of the nav bar so it doesn't move the graphics.
Masonry Addition - Added in styling for links in the masonry block.
Masonry HTML Integration

Integrated HTML NEEDED for improves on masonry.js
Merge remote-tracking branch 'remotes/origin/EXP-SQLite' into Release_1.2.x
Merge remote-tracking branch 'remotes/origin/EXP-MediaInfo_update' into Release_1.2.x
Remove obsolete DVBSubtitle2 project and bin and replace by DVBSubtitle3
Add DVBSub3.ax (Debug filter)
Add Initialize hosting environment to SetupTV
Step 1 - Fix Scanning issue (DVBS) related to LnbType.
Optimized margins to avoid overlapping of PiP screen
Using hidden menu as general style

Created new HiddenMenuButtonWideStyle used in new HiddenMenuListViewStyle
Adjusted content presenter area in master_bare to cover nearly full screen (required for placing menu)
Setting different color for the nav bar

Setting different color for the nav bar download titles.
fixing up grammar
Changed the permission and economy to use the ones in the core.

Also and deleted the properties file because I'm going to use the yml
instead.
Forget Snake Yml. Best just to use the bukkit config file reader.
Don't know why this didn't commit with the rest of it :/
More chapters added.
added s semicolon

I added a semi colon to end the variable listing
ENH: Add a progress bar in the GUI
Switch to RestKit 0.9.3 since that's the current stable release.
Added header file for PIC18F constants.
Reimplementation
++++++++++++++++

- Split up mathparse contents in multiple files.
- Added more extension-capabilities (Group, Function, ExpressionPrefix)
- Modified parse.lex.Lexer.read() to accept a various number of arguments that
  will be used as patterns to match tokens from the current position
  additionally *before* the standart patterns.
Made name and location fields mandatory, as per specification.
Me missing from OSM-S-59
New Branching of Experimental - Initial Commit
iPlayer Integration Testing (get_iplayer && mplayer)
iPlayer feed quality/resolution optimisations & bugfix.
Originally we were pulling the highest quality feed regardless how the scaling was on the display.  We now determine quality by the size of the iPlayer object on the screen.
Also fixed possible bug where video would pause (-noconsoleinput switch on MPlayer)
Weekend Dump
Multiple additions:
Change FPS Counter/Flame Limiter for something more configurable.
Implement method to set maximum quality of stream for iPlayer.
Make mplayer calls more efficient (use pulse as audio due to ALSA bugs.)
Some logic fixes.  Also formatting cleanup
Start moving drawbox methods to a seperate structure.
Moving some objects/checks.
Remove unwanted build files.
Update.
Weather display coding - part complete *TESTING*
Multiple Additions
 - Added weather icon display dependant on condition.
 - Allow for Alpha-channel override when calling Box.doDraw func.
 - Add missing variable init within each class constructor.
 - Formatting fixes
Multiple Fixes/Additions:
Make weather condition icon fade between transitions/changes in status.
Fix issue within drawText function, ensure we delete the correct GLTexture (this was causing graphical glitches with Textures)
Dynamically load weather condition icon instead of caching all textures.  (May be reverted due to above glitch fix)
Increase number of supported iBoxes to 128.  (iBoxes are used to draw all textured items on the screen)
Rename all textures to corresponding tIcon variable within code.
Tidy up Formatting (BSD/Allman)
Nightly
Multiple:
2 sets of weather icons, night and day imagery for sunset/sunrise.
Add functions for calculating sunset/sunrise times.
Some boxing code optimisation (correctly moving glGenTextures for instance)
Misc. fixes.
Correct pathing from testing.
Nightly (testing of time icon switch)
Fix the day/night weather icon toggle.
Board information processing - Start parsing .ini file with defined structure.
Tests compile, but sadly do not run.
Plus* v3.0.0 Updates

Too many to list; incoming bug fix commits.
Update src/org/obvial/obvial/Carta.java
Core/Warden: Various cleanups and warning fixes.
thanks to: leak

Signed-off-by: Bootz <bootz@projectskyfire.org>
Updated script names in the item_template. Also renamed a file.

Signed-off-by: SkyFire <admin@projectskyfire.org>
Forgotten Chnage

Signed-off-by: Sovak <Sovak007@gmail.com>
Implementa link a las recetas desde los Productos
Cambios SP
Initial test.
Starting fresh.
Updated iso schematron xsls -- added customization layer to remove
WADL sch bug(?)
Generate wadl.xsl on build.
Check against schematron when normalizing WADL.
Test on reference missing #.
Missing internal link test.
Missing include test.
Missing code sample test.
Cross reference tests.
Test on missing # in set of refrences.
Test on multiple missing refernces on resource_type.
Test multiple missing external references on resource types.
Check to make sure resource_type references actually point to a resource_type.
Test external references of the wrong type.
Another test on missing external references -- bad file.
Extenernal missing link tests.
An external link of the wrong type should be rejected.
Customization on generated WADL xsl that traverses WADL dependecies.
Core/Channels: Remove unnecessary calls to FindPlayer wherever is possible
- Add better opcode debug messages
- Move isValidChatMessage debug messages to trace
Fix error in 32c259b1ce (broken chat)
Fix wrong replacement in 32c259b1ce (Fixes a minor error msg)
Core/Network: Enable trace loggers for packet send and receive (just account + opcodeName, opcodeId)
Core/Achievements: Minor correction in Log msg
Closes #8396
Typo Fix :D
Fix logic error in 81606e5 (Fixes orange ooze in Professor putricide)
Closes #8418
Addition to last commit... "Fix logic error in 81606e5 (Fixes orange ooze in Professor putricide)"
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore
changed options.txt
changed gitingore
Merge branch 'master' of https://github.com/Regiden/RadicalFishEngine
deleted bin
Elv agreed to includ mah vengeance datatext, deleting
moved insert to emit model
Reorganización y documentación de código

Signed-off-by: Rodolfo Cartas <rodolfo@blimp.mx>
添加fix jEvent
添加_dispatch, jEvent
Updated testgen script
Update testdec.c

Initial full scriptgen
Some refactoring regarding adding more fonts in the future
Some refactoring regarding adding more fonts in the future
Some refactoring regarding adding more fonts in the future
Increasing a bit the font size
temporarily fixed iframe resizing
fixed pagination hack - funky request action with iframes, sheesh
Added licence head into source
The latest proposal, stays true to ServiceStack's form :)
Ver029 RC1
run test for no inhibition.
Fix up presentation of README
Add login with twitter and try as guest

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
* Quick fix in conversion rate calculation for advertisement clicks
* Added Entity log messages for name changes
* Added EntityLogProductAssociation model
* Added logging and interface to Entity association with Product
* Refactored views and documented inheritance structure
* Changed some class names to keep consistency in the project
Merge branch 'feature/entity_logs' into develop
Enable Auto Migrations when running application
Updated DevTools SQL
Added HybridCraft Fuel
Fix Gallery View
Put in stubs for push forking
Fix issue #1

Added error catch to direct.php to be more polite when a class cannot
be found
Fixed JS cloning issue
add ShowTimecontroller.m
remove file
add file
added cell classes with info about class number
removed cells with info for class number. They are moved to SpInfo class
cells with year and term are moved to SpInfo class
added cells with year and term
changed name of the class and added method which fill room numbers
updated Mac makefile for oscillatingModel
Merge branch 'master' of github.com:TTU-Graphics/FinalProject
commiting changes, grass still does not work
modified some more files, grass still does not work, but neither do the faces
matchMaking logic working
Allow remote access to MySQL by adding new user
Initial Contribution
Code drop from //branches/cupcake/...@124589
auto import from //depot/cupcake/@135843
auto import from //depot/cupcake/@135843
1. Removed commented include of <endian.h>
2. added config-compat-freebsd.h and updated makefile to include it
   while compilation.
Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Merge branch 'open_source_contributions_cherry_picked' into google_internal
1. Removed commented include of <endian.h>
2. added config-compat-freebsd.h and updated makefile to include it
   while compilation.
Merge donut into master
modify elfutils Android.mk to support SuperH
Merge change 10544

* changes:
  modify elfutils Android.mk to support SuperH
eclair snapshot
merge from eclair
merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
merge from open-source master
android-2.1_r1 snapshot
reconcile android-2.1_r1 snapshot
reconcile main tree with open-source eclair
am 5b7c883d: reconcile main tree with open-source eclair

Merge commit '5b7c883da6527a411236592dd450893260485621' into eclair-plus-aosp

* commit '5b7c883da6527a411236592dd450893260485621':
  android-2.1_r1 snapshot
am e4034f0e: am 5b7c883d: reconcile main tree with open-source eclair

Merge commit 'e4034f0e42fff82a84c8ad3321c80a96f3b9afab'

* commit 'e4034f0e42fff82a84c8ad3321c80a96f3b9afab':
  android-2.1_r1 snapshot
set RAILS_ENV to the same environment as RACK_ENV
custom_domains:basic is now a heroku platform feature.
swap examples to scheduler:standard
#35 On the Document Information screen the range for years for the
degree date should be expanded or be made configurable.

#17 During submission, if the student clicks remove supplementary
documents without selecting any documents it blows up.
Update readme
Begin work on a nice welcome screen
Improve performance of the spectrum analyzer view.
Ammo system improved. Reload function added on server side but not on client side
merge week_days && discount_day_schedule
Implemented transition methods

1. Delete DownloadTaskWorker class and move code to start method of
DownloadProcess.
2. Added some transition methods
3. Fixed some small bugs.
4. Added StateMachineTest class for testing state machine.
Finished state machine to control lifecycle

1. Used state machine to control process lifecycle.
2. Added synchronization code to trigger finish transition.
Implemented multi-requests handling feature and pausing a task feature.

For DownloadProcess: we added proxy in to it for DownloadSegementWorker
invoking receive event.
For DownloadSegmentWorker: we added pauseFlag to pause running threads.
For CreateTaskService: we used event listener to listen state change
(receive action will trigger state changed from Started to Started),
when all bytes received, finish transition invoked.
At last, we added PauseTaskRequest, PauseServiceResponse, and
PauseService.
List reviews.
No longer seeding Math.random() as it messes with random UUID session generation
Merge pull request #44 from isuftin/master

Random number seeding removed due to bug it introduces for session generation
Fixed VC110 (VS 2012) compile.
Fixed vendors and cache opcode values.
Fixed HandleWorldTeleportOpcode, HandleMoveTeleportAckOpcode, MovementStartForwardSequence, MovementHeartBeatSequence, PlayerMoveSequence.
Some other move fixed + cleanups.
Updated opcodes.sql
Some opcode updates.
Updated some quest opcodes.
CMSG_MOVE_TIME_SKIPPED
Fixed SMSG_TRAINER_LIST
Merge branch 'master' of https://github.com/Strawberry-Pr0jcts/StrawberryCore.git
Part1 of trainer_list
Update master
Fixed SMSG_LEARNED_SPELL
Updated opcode values for SMSG_TRAINER_BUY_SUCCEEDED/FAILED And tab fixes
Send SMSG_TRAINER_BUY_FAILED if money < spellCost.
Oops..
Prevent sending transport maps in player update object (will be replaced by a better fix later). Should fix the random teleports for this moment...
Fixed aura update (Fixes warrior/paladin client freeze on world login)
Core/Talents : Fix some talent opcodes, further work for talent calculation

Signed-off-by: Netcho <kkotalrski@abv.bg>
Merge branch 'master' of github.com:Strawberry-Pr0jcts/StrawberryCore

Conflicts:
	src/game/Opcodes.cpp
	src/game/Opcodes.h
Core/Opcodes : Some things git f*cked up

Signed-off-by: Netcho <kkotalrski@abv.bg>
I really hate to be pressed by time

Signed-off-by: Netcho <kkotalrski@abv.bg>
Bump version & QVM syscall ABI.

ABI bump is minor; backward compatible, for once.
Import CMakeParseArguments.cmake for use with cmake 2.8.2.
For limited build log access, report the team.

This is a broadcast message to all players. It should, perhaps, be limited
to one team, but that requires extra code to avoid spamming the server
console.
removed default Rails page
Finicged layout and routes
Added all necessary variables
start/update/discard primite

when drawing simple mouse controlled primitives, this doesn't make any
difference. But if I ever to implement text primitive or anything that
relies on releasing mouse button while still interacting with a
primitive, I need more flexible way to deal with primitives
Fixed navigation toggle
Merge branch 'develop' of github.com:WhitespaceIO/Ushahidi_Web into develop
Added new tilesets, Outskirts working level

Also increased acceleration, temporarily?
Added some member function definitions
Deleted keyboard coffee file
#301. isAvailible condition now checks only same space
changing README to reference the docs
Core: upgrade.sql changes
Control Panel: minor translation bugfixes
Renamed Component
Renamed Component
[ADD] acy_stock_merge_picking_done: This module allows you to manually merge stock pickings (Incoming Shipments, Delivery Orders, Internal Moves). Extension that allow merge Stock Picking with state done.
Import cleanup (No warnings!)
Returning bullet object upon detecting fire
Starting on basic wall avoidance
Adding a few models and its builders. Testing is near.
added chart editor
date.js parse added
added missing @dynamic for token
updated project settings
Add nodejs conventions
Fix lint settings
Add example controllers and views
Including upload script
added preview pane controller and widget; changed layout to put both color map and preview at the top.
Fix @Nullable annotations.
Remove defunct TestServlet from web.xml.
fixed formatting issue
Fixed errors/notices and removed donate/sidebar area.
Revert some markdown adjustments

Github's README presentation doesn't break very long code lines.
messages 
back method
back button icon
back funktionalität
new Message 
logos
Tabviews created
1. Redesign game.xml;
2. Showing the next block;
3. Adding Pause and Resume function.
上傳部分圖片
report page 完成 ， 更改一些section tag成div，使icon的完全對齊主內容
sped up previewing
ls alias cleanup
メソッド間の一貫性の無さが顕在化した (むしろ喜ぶべきか？)
added additional assertion to TagsTest testisEqual
Migrating null employees vacations too
Syntax highlighter
Title change
Merge branch 'master' of github.com:andrewjknox/Personal-Blog

Conflicts:
	src/AndrewKnox.Blog.Web/AndrewKnox.Blog.Web.csproj
	src/AndrewKnox.Blog.Web/Controllers/HomeController.cs
	src/AndrewKnox.Blog.Web/Views/Home/Index.cshtml
	src/AndrewKnox.Blog.Web/Views/Shared/_Layout.cshtml
	src/AndrewKnox.Blog.Web/Views/_ViewStart.cshtml
acceleration working
Added options to init.
Use generic implementation for non-generic RelayCommand
Switch to new method signature using ViewGroup.
ANDROID "COMPLEX" SKETCH: COMPLETE LIFE-CYLE IS IMPLEMENTED!
In progress
Working insertion with bug

Blocks with flaps can be put into the square block holes, which is not
good
Moved factory to mighty homepage.
Deleted /readme2.md
Update formula for strigi, using latest stable version of code. There's also a patch to disable strigidaemon and strigclient because they depend on dbus
Updated soprano formula, upped version to 2.7.5, fixed RAPTOR_INCLUDE_DIR, and create small patch to fix the behaviour of SOPRANO_DISABLE_DBUS:BOOL=ON 
Dropped patches that are already integrated into release, and bumped release to 4.8.2
Merge branch 'patch-2' of https://github.com/aseques/homebrew-boneyard
Merge branch 'patch-3' of https://github.com/aseques/homebrew-boneyard
second commit
Merge branch 'master' of https://github.com/ataklychev/android-tetris
First version

Signed-off-by: Adela Tort / Jordi Isidro <adela.tort@gmail.com>
creating symfony2 app
more methods implemented. added ShareUser
fixed display settings
Adds support for unicode songs, whereby incoming xml data is encoded into unicode and then then decoded upon export
Fixes NPE in GetAdminLevelsHandlers

Should be using inner joins in most places to avoid null
values. Here NPE was occuring because there was a location
not associated with any AdminEntities, which is entirely valid.
Changed in branch.
Merge remote-tracking branch 'origin/branch-1'

Conflicts:
	README.md
Symfony 2.1 beta3にアップグレード
ユーザーの登録情報の更新画面を2つに分割(パスワード変更画面とその他の画面)。
Clarify text about simulation; waffle plot
Showing video player in dialog
Merge branch 'master' of https://github.com/benmbaum/CodeSlingers2012
Added SpacelessMiddleware.
Cleanup settings.
0.2.0102

Changement de style du message "Connecting with Houston"
Changes merger to just merge to a single segment. Matching number of segments doesn't actually align indexes.
Added documentation to PHPAnalyzer + minor bugfix
heroku rexec tweak
adjusted tests for newer mongoose_model.
adding failsafe tracker on loader
fixed bug in last view update function
added todo, cleaned up notes
Fixed a typo on the index page
Update Task 3/Exercise 8/lib.h

Changed literals
Revert "Comments update"

This reverts commit 8b354d48765aa49f69442bd1750cb3d6253c08bc.
Revert "Revert "Comments update""

This reverts commit eb7bf7d620a764949df1bd6ff13ae4f320d06bdc.
Revert "Revert "Revert "Comments update"""

This reverts commit 7c91fb10a4c08f97684d84875cd5384b0bd74448.
Removed direct reference to script name.
Version bump to 0.5.0
Bug fix: Unobservable#instance_events_for(...) provides special handling for Class#ancestors when called on a singleton class.
Correct boards.txt now passed to ard-parse-boards.

PARSE_BOARD usage in Arduino.mk fixed to be PARSE_BOARD_CMD.
--boards_txt= command line argument is now correctly passed
into ard-parse-boards.
Minor gradebook filter changes
yep
deleted stuff
Changes
imx233: now fully booting

with SD card

no console!

Signed-off-by: michel <michel@midesk>
imx233: Fixed pl011, console works

Needed an extra probe response

Signed-off-by: Michel Pollet <buserror@gmail.com>
imx233: USB working

All boot to a prompt from the SD card, usb work, I can use a wifi
usb stick plugged in the host from the emulated linux.

Signed-off-by: Michel Pollet <buserror@gmail.com>
Just one command, pull. It does both clone and pull automatically.
Bumping to 0.2.0.
Merge branch 'master' of github.com:busterjs/buster-dev-tools

Conflicts:
	bin/buster-dev-tools
updated read_input_file function to read in sphere object
Fixed use of uninitialized key when ALLOWALL not present in /etc/stats.conf
Added a few scratch files which help me understand music.
get the critical task for the viewed project so the actual end date can be calculated
Merge pull request #87 from robertbasic/hotfix/1047

Project actual end date
fixed the path to the config template;

resolves http://bugs.web2project.net/view.php?id=1195
Merge pull request #156 from caseysoftware/issue-1195

fixed the path to the config template;
First draft of euMetrica 2 by D

Login, Patient Login, Notifications screens drafted out, linked up.
Next up - finish up patient side screens and link up.
timob-11758: used JS Object as arguments on rhino and added exception handler on v8
[TIMOB-11478] Fixed bug with ios aliases being listed on Windows.
[TIMOB-11867] Fixed uglify version to 1.3.
Merge pull request #3474 from pingwang2011/timob-11758-3_0_X

timob-11758-3_0_X: Android: HTTPClient: the payload for the callbacks ondatastream and onsendstream is incorrectly set on Rhino
[TIMOB-5435] Doc Update
Merge pull request #3486 from vishalduggal/timob-5435-doc-30X

[TIMOB-5435] Doc Update
[TIMOB-11763] Android module with JNI won't build
Merge pull request #3488 from billdawson/timob-11763-3_0_X

[TIMOB-11763] 3_0_X Android module with JNI won't build
[TIMOB-11861] ensure rowContainer frame to match row contentView.
[TIMOB-11867] Updated minimum node-appc version to 0.1.17.
Merge pull request #3490 from mstepanov/timob-11861-30x

[TIMOB-11861] ensure rowContainer frame to match row contentView.
Merge pull request #3482 from cb1kenobi/timob-11478_3_0_X

[TIMOB-11478] Fixed bug with ios aliases being listed on Windows.
Merge pull request #3484 from cb1kenobi/timob-11867_3_0_X

[TIMOB-11867] Fixed uglify version to 1.3.
[TIMOB-8740] Fixed small bug with absolute module ids in modules.
Fix inline tests when run over a webserver
DUR, save before destroying
Very beginnings of simple qt gui.
Issue #383: Rework preferencies and new project wizard to use
CeylonConfig api
Issue #383: Rework preferencies and new project wizard to use
CeylonConfig api (added up/down buttons)
update cmr
Updated to latest JARs
Updated to new JARs and fixed current workinf directory problem in BuildFileManager
Merge remote-tracking branch 'origin/issue383-project-repositories-preferences'
Add Aether support in the IDE. Fix #411
Added ALL missing comments to the class DataManager.

Also added more parameter checks.
Addition: SQL config

Table setup in the mrt database.
Use logging module.
Add API compatiblity test.
Implement platform API.
Add ignored directory for local working.
settings: find json files from package path.
test: add separated sources.
Change syntax for support Python 2.6.
'Settings' object is unsubscriptable.
test: move tests to docfile.
settings: add User and plugin dir to glob path.
Fixed arch().
Rename if_sublime/ to lib/
Move doctest to test suite file.
Fixed line encoding conversion.
updating release notes for showing packages and updating nugets
Corrected build order in MakeUpdatePackage-Tool
Made UI-Settings default values more sane
Updated incorrect version info
Signed-off-by: chi <christoph_hipp@web.de>
Added root url pattern.

Added regex to support an unnamed root url.
Also removed another file that should not be tracked.

Signed-off-by: Bennie Leonard <bennie.leonard@gmail.com>
Merge pull request #3 from benniel/urls

Added root url pattern.
Small comment for agent-impl slots.
ABM Comentario
lth
don't reference raid::install-tools... rely on crowbar to make sure that they got installed, if available
proposal creating is problematic as a check for enabling hw monitoring. Use just the presence of the ipmi/raid barclamps as trigger
Merge pull request #10 from aabes/d6b3af2c6fcbf4feac53a5f44e28a8bd10a25e87

Fix nagios test for enabling hw monitoring to depend on barclamp presence [1/5]
Update timestamp in static file only if uploaded. Allow single hash in :eager. Do not consume options in :transformation
Merge branch 'master' of github.com:cloudinary/cloudinary_gem
Tweaking image navigation styles.
Project info styles
Fixed the info page structure.

Abstracted the subpage navigation into it's own template.
New Stevers.jpg Image
Add presentation
Change timer
iBleu
don't hide _nres, necessary for nslookup in busybox.
TLS: Call kernel helper in additional situations

ARMv6 has HW TLS support, and thus we should be using it rather
than hacking the Linux Kernel to use the software mechanism.
Unfortunately, ARMv6 targets without Thumb2 do not support the
necessary TLS instructions in Thumb Mode. Converting the tls libc
routines to ARM Mode will require an additional branch to switch
modes. Therefore, let's simply use the Kernel's Helper Routine
which already operates in ARM Mode. This changed behavior only
applies if the HAVE_ARM_TLS_REGISTER option is defined.
Otherwise, the existing paradigm is used.

Change-Id: I282697b0ab97cb62affd018494076e6ffa4d392a
Revert "don't hide _nres, necessary for nslookup in busybox."

This reverts commit 7744b7e21c49a1b7fbc6ea8e959e0df4859833d3.
Add missing define to build qcom libgralloc.

This is needed by hardware/qcom/display/libgralloc/ashmemalloc.cpp.

Change-Id: I7b35bcdaedf3874d17a0e6ce18931c11db1e133d
Add missing define to build qcom libgralloc.

This is needed by hardware/qcom/display/libgralloc/pmemalloc.cpp

Change-Id: Id0732b82ed6c1852def9688544ec92e04afeff00
Add missing define for libcopybit.

This is needed by hardware/qcom/display/libcopybit/copybit.cpp.

Change-Id: Ic50a75b93b39443b772dd4cab67a55f75ad2b5ad
getopt(): fix missing carriage return on bad parameters

This affect all command line tools which show the usage on stdout
after an invalid parameter error (printed on stderr)

Change-Id: I8e2cb3fda241ab989dc42055f15082f8b3ba1397
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
headers: Unbreak some ARM syscalls

Restore the outside-kernel exclusion for some syscalls that was
removed by change I959b64280e184655ef8c713aa79f9e23cb1f7df4,
since these syscalls are used elsewhere.

Change-Id: I5b5bf3d78edd137e820d25281a375966b6c009ec
Added: hooks manual
Prevent building of geo-index for now.
Fix Zend Framework 2 Db link
Merge pull request #142 from Yrwein/patch-1

Fix Zend Framework 2 Db link
Added "Application Design Patterns" section.
Rename Application Design Patterns section.
Added isChild block.
Rewrite of Design Patterns sub-section.
Added Design Patterns page.
Merge pull request #115 from stevenbenner/gh-pages

Added application design patterns section
Add comments to code sample, making more clear that 'expensive_data' is a key for data in cache
Spaces for tabs
Merge pull request #113 from grakic/gh-pages_objcache

Minor addition to code example in Object caching section
Basic Hybrid\Table
Add docblock for Hybrid\Table and use of() for named Table.
Update docs
Improvement to Hybrid\Table with docblock example
Missing pagination for vertical view
Update docblock and fixed an issue where $pagination is not defined
Fixed missing ; after closure

Signed-off-by: crynobone <crynobone@gmail.com>
screenshots size fix
Merge branch 'master' of github.com:constpetrov/GitHUB-client
README.md fixed
on handsets where Gwallet is enabled, HCE turns off for good after Gwallet is fired up.  This patch fixes the scenario of Gwallet and HCE living happily together.  it is a fix, really, for the intended function of when an HCE application is in the forground, it has control, all other times Gwallet gets control of emulation from SE.

Change-Id: I8c37e2799c3a2232f7cc1b18d1b40c6986e98e44
Merge remote branch 'upstream/jellybean' into jb
Avoid conflicts saving checkpoints

Replicators now avoid saving a checkpoint while a previous save is still in progress.
Instead they wait till the save finishes, then start the new one.
That way the second save will have the correct revision ID to replace.
Fixes #48.
* Fixed problem where local processes could block reading input.
* For first few refresh intervals, check for updates every second to catch up quickly.
* Refactored slightly to allow for more OO in the different log viewing types.
* Combined ClientLogAction and LogViewerAction. Cleaned up classes to removed unnecessary code.
Added new SshLogViewer, probably should switch to using JSch though.
Simple title renames.
Watch for process exit and stop viewer when that happens.
Don't close window when monitoring ends.
Updated info to the readme file
Add 10mb ram hack
mincss: refactor and update docs.
[Delivers #28268911] Added checking for command prompt after executing any command.
Added a DELETE EVERYTHING FOREVER button
Merge branch 'master' of github.com:curtisullerich/attendance
fix recursion bug in Makefile and package.json
@dan great new README
Add a couple more files to .gitignore
fix javascript file references
Add posts mod_date to admin listings, fix bug on queryset in generic view
All classes now in the bootstrap, added a forge method into Mandrill.php to allow fuel-style calling of the class
Use switch instead of if-elseif.
Unnecessary null check since we no longer set speakers to null when
we're done playing.
Extract method for handling pauses.
Making some tests 2
changing lingo
added first mailchimp form
adding GA event tracking
Import buttons to load available source data.
fitText is applying automatically
strange behaviour of fitText
Trigger onResize after refreshing fonts
Merge pull request #11 from hash3g/gh-pages

fix for fitText applying bug after refreshing font
moving passing tests
Ignore .rbenv-gemsets file
Rename binary and use simple array append operator
Added convention to add the local lib dir to the PATH
Add Apache 2.0 License
Merge branch 'fix-executable'
add Jtag loader instruction
Remove redundant zip

Signed-off-by: David Lowe <david.lowe@ncl.ac.uk>
Added getters for ShipAction and made ShipIdentifier instance vars public
sscheme exported so settings persists in tmux
Arreglar el hibernate.properties
Merge pull request #668 from diegosarmentero/master

adding list comprehension to completion
improves in completion with inheritance
Merge branch 'master' of https://github.com/diegosarmentero/ninja-ide
Merge remote-tracking branch 'upstream/master'
Incorporate angular seed project for project structure.
add some greys to colors
исправил
Merge pull request #547 from AlmazNasibullin/master

chatGui
Validate as XHTML 1.0 Strict
Give relevant description & keywords on posts
fixed items problem
Stuff
Merge branch 'master' of https://github.com/doubledubba/bbhs-intranet
basic info
Merge pull request #1 from doubledubba/experimental

basic info APPROVED
Ignore File

Adding an ignore file so that my mac won't add a .DS_Store file or
anything like that.
RandomSubChainIterator + @Override use
SubChainChangeMoveSelectorConfig + SubChain renames
the toDoubleArray() method has been renamed to toDoubleLevels()
terminology use of levels
JBRULES-3563 winningScoreDifferencePercentage
JBRULES-3563 refactor to worstScoreDifferencePercentage
JBRULES-3563 add average too
Correction bug test de non-existence d'étapes
Ajout du dialogue de spécification de dimensions pour la création de tranche
Externalisation des textes, remplacement de l'embed YouTube par un lien
can retrieve just the latest updates based on post id and entity
fix link to format page
finished prep for Oct 11
Work on resque chef recipes
Put template in the right place
add basic functional tests
Updated for all new changes to general bug finding and for using the com project DB. #8
Revert unwanted changes

This reverts commit c6e86c98fd5f486f7250ea8e8f88cecdec9a08fe.

Conflicts:
	class/HPGrowingTextView.h
	class/HPGrowingTextView.m
Initial commit of simple tabs.
DataModes
DataModes
DataModes
no summary available
;;; auto-yasnippet.el --- Quickly create disposable yasnippets ;; Author: Oleh <ohwoeowho@gmail.com> ;; This file is free software; you . . .
no summary available
no summary available
Rollback to 2012-09-03 17:28 UTC
Rollback to 2012-10-20 02:00 UTC
no summary available
updated version
guile 2.0.0 compatibility
no summary available
no summary available
no summary available
Import GoDaddy web server pages into a git repo for GitHub.

Use github's prefabricated "WordPress .gitignore file".
Add WordPress files (with exported content in xml format) and Zen Cart,
Added speed to enemy, with methods for return speed, increasing and decreasing speed
fixed the way map is coordinated with slick
Only re-sort entities if not in Weltmeister
Removed "-nobanner" option from ipython
MYB-1526: Remove inst-skinning and add branding widget to 404 template
fixed modified sdk
almost done 383