labofsahil/github-event-dataset-2012 huggingface dataset:
Merge pull request #142 from techhat/release

Release Notes for 0.8.2
Merge pull request #143 from techhat/release

Fix Rackspace stacktrace error
Add docstring for new service name option

Compute service name isn't hardcoded anymore, provide the old value as an example
Typos and expand abbreviations.
Merge pull request #145 from duego/fix-openstack-opts

Add docstring for new service name option
Merge pull request #146 from s0undt3ch/develop

Typos and expand abbreviations.
Merge pull request #147 from techhat/release

Made state.highstate not required
Merge pull request #148 from techhat/release

Adding documentation for salt-cloud 0.8.2
Mocked salt.client
Merge pull request #150 from techhat/release

Change os to script
Invalid assumption of existing grains key

Set a default if there is no grains key.
This happens when using map_grains in profiles.
Merge pull request #152 from duego/fix_grains_opt

Invalid assumption of existing grains key
Fire events when minion has been created/destroyed
Merge pull request #153 from techhat/issue139

Fire events when minion has been created/destroyed
Adding --deploy option
Change --deploy to --no-deploy (since deploy is the default)
Merge pull request #154 from techhat/issue123

Adding --deploy option
pep-8 fix
Merge pull request #155 from techhat/issue123

pep-8 fix
Adding start_action to cloud providers (except joyent)
after x years programming
remove and get methods were added to HashTable
Added email link, help me god
Removed competing fonts from styles, updated styles on settings slider
Settings / about can no longer open over each other
Updated placeholder image
Show how to reload a grid in the MVC FAQ
Extend the troubleshooting help topics
Fixed wallet permissions
Tileset building-small
Fixed MFC Bloat in Visual Studio 2010 [Part 1/2]
Fixed MFC Bloat in Visual Studio 2010 [Part 2/2]
Add known issue.
Fix crash on \t with no arguments
Add known issues.
fix \iclip issue.
fix vector drawing issue.
fix "Multiple instances of simple fade" issue.
Fix purple fringing on some VOBSUBs.
*Fixed* a \h issue.
Fix a corruption bug.
Roll back some changes to fix a codepage issue.
Support sub-pixel in drawing commands and more check
Adding TV/PC support.
Add Yuv Range options to UI.
Support ass yuv matrix option.
minor changes.
Auto-versioning.
Show/hide tray icon toggle.
Record version info to reg.
Basic Element Styles Inplace

- Added a test suite with all the elements (well almost)
- Added stlyes for the base elements
- Lot's more, but Friday vOv
Amélioration de fichier readme
Style modifications. Using sjcl for all hashing operations.
Added creating, editing, selecting and moving Roads.
Added commands to generate all .lot files or just for selected cells.

Removed the modification time check when running Generate Lots.
Added reading/writing of Roads in the project file.
Added "Width:" label to the RoadsDock spinbox.
Properly remove roads from the selection when removing a road from the world.

WorldScene wasn't getting a chance to remove the road from its list of selected
roads.
Added cursor to CreateRoadTool and handles to EditRoadTool.
Added editing/saving/reading road tiles and traffic-lines.

Made new icons for road tools.
Road bounds extend past the endpoints according to road width;
MapComposite blends in road tiles.
CellScene updates itself when roads are edited.
Added road tools to CellScene.

Added Roads.txt.
Fixed road tools crashing when there was no open document.
Fixed missing "null" road tile.
Added road tiles to generated .lot files.
Added "BMP To TMX" commands.
Added drag-and-drop, thumbnails, saving, loading, and moving to BMP images.
Added an option to assign a map to a cell based on the cell's x,y and BMP.
Dim out cells when the WorldBMPTool becomes active.

This is to make it easier to identify the BMPs.
GenerateLotsDialog, selecting BMPs, multiple ZombieSpawnMaps, etc.

ZombieSpawnMap.bmp handling is different.  For "muldraugh.bmp" there must now
be a file called "muldraugh_zs.bmp" which is just ZombieSpawnMap.bmp renamed.

The directory to write .lot files is now per-project rather than global.
Added GenerateLotsDialog.
Added "Show BMP Images" option to the View menu.
Added "Remove Selected BMP Images" command to the World menu.
WorldBMPs can be selected/deselected.
WorldBMPTool gained selection rectangle plus moving multiple BMPs.
Fixed the Z-ordering of roads (they were over the cell coordinates).
WorldEditRoadTool updates road handles when coordinates change via undo.

Fixed crashing in WorldEditRoadTool due to accessing an already-deleted
WorldRoadItem.
Change image_zs extension to image_zsm (for ZombieSpawnMap).
Update progress for each cell when generating .lot files.
Update maps and images when a TMX changes on disk.
Update MapImages when any map that made up the image changes.

Previously, only the modification time of the top-level map was considered.
Now, the names of all sub-maps (aka Lots) that make up an image are recorded
in the image data.
Fixed a warning thrown up by Eclipse about a resource leak
PORT-71: Eclipse Windows C++ project now all sorted (what a freaking
trial that was!).
Updated .gitignore to ignore the Eclipse C++ project build directories.
This is anything starting with "./(" such as ./(ng6 win32) libRTI-NG.dll/
adjust srep spoke direction manually
Fixed a couple errors and warnings
Merge pull request #9 from tips48/findbugs

Fixed a couple errors and warnings
Improve the PingListener
Fixed data tag
Merge branch 'master' of github.com:tjsavage/shoopdoup

Conflicts:
	ShoopDoup/Properties/Resources.resx
Code style: Fix indents.
osnovna fizika
Add user edit support
Add tool registration use case implementation.
Fix per la 1.0

Signed-off-by: Tommaso Visconti <tommaso.visconti@gmail.com>
Added functionality to MF and SOAP-MF for report supported formats, refs #18, #19
This file changed somehow I don't know why.
Added FunctionProvider to metamodel, and in GMF editor as node w/
compartment. refs #8
refresh end-lvl-popup
Pequeños arreglos en el diseño
FOTableau uses a queue to build the tableau.
No results alerts for index
issue #55: add BUNYAN_NO_COLOR envvar support
get() makes a lot more sense than idx()
Fix: Imports for scripts
Changed ynummer to ydernummer
Use the logger for endpoint messages and display socket information
instead of starting time
css3 spinner
mergeconflict
Fixed WP8 project:
Readded SharpDX.WP8 reference
Fixed incorrect refences of GamePage
Full screen, without text
Merge pull request #1087 from Nezz/wp8_fix

Fixed WP8 project
Merge remote-tracking branch 'remotes/upstream/develop3d' into develop3d
Reorganize package
1.8 Exercise 1.3
Fixed #50 -- Tagged pages now support PJAX correctly
Fixed #56 -- ReplaceState now sets first page state
Syncing the CommonLibs, SMS and sqlite3 directories

git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@4652 19bc5d8c-e614-43d4-8b26-e1612bc8e597
修改建筑家后台组件
Branchless defines in gfxDrawOBJWin
working with ssh communication
added demo for accordion
bug fix - not allowing user to toggle each accordion group.
Merge branch 'add_demo_for_accordion' of git://github.com/ericzou/bootstrap
Added ui.bootstrap.dialog module, $dialogProvider and test skeleton.

No implementation yet, just the groundwork - or is it ground work ;-)
Basic version of $dialog

Support for options backdrop, modalClass, backdropClass,modalFade,
backdropFade,locals, callback, keyboard and backdropClick
Fixed option contstruction
Fixed backdrop click invocation
Fixed backdropClick invokation
Removed the use show and hide

They weren't even relevant in the first place. Refactoring remainder...
Added controller attribute and transition support
Merge branch 'master' of https://github.com/typesafe/bootstrap
add ConfigRenderOptions.setJson(false)

This allows you to render using HOCON extensions (other than
comments; comments are still controlled by separate options).

Intended to address github issue #44
Update notes for submitted changes

* [BUGFIX] Replace calls of tslib_gifbuilder with namespaced class
Update notes for submitted changes

* [TASK] Optimize compatibilty class loader
Update notes for submitted changes

* [FEATURE] Limit file extensions in FAL element browser
Update notes for submitted changes

* [FEATURE] Use FAL file extension filter in TCA
Update notes for submitted changes

* [BUGFIX] Hide version selector if workspaces are used
[BUGFIX] Migrate images and links to files to FAL on way to RTE

Links to files or folders in pre-FAL RTE-content should be transformed
to FAL-compliant on way to RTE, whenever possible, otherwise they are
viewed as external links.
FAL-related attributes should also be added to images, whenever
possible, on way to the RTE.

Change-Id: I17e649986a57865fee738575be058c53ac30a50d
Releases: 6.0
Fixess: #36827
Reviewed-on: http://review.typo3.org/10984
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
[FEATURE] Scheduler: Allow execution using "at"-daemon

Add possibility to execute scheduler via "at"-daemon instead of via cron.
This allows the scheduler more flexibility when to be invoked next.

This can be useful in environments where no cronjob can be set easily,
but access to at daemon is possible.

Change-Id: Ib450e59d76e23eb2eeb1ab4769f49d8ba8bd96b5
Resolves: #34227
Releases: 6.0
Reviewed-on: http://review.typo3.org/9177
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Update poms

- update parent poms to 1.3.3-SNAPSHOT
- remove child groupId if it matched the parent
- use SNAPSHOT instead of qualifier for versions
Add snippets, surround, ack instead of grep.
=List_of_TFs: TFs from NCBI/Chromosomal Positions from UCSC; Updated ncbi_tfs.py to include call to UCSC database"
ncbi_tfs.py: Download TFs in NCBI database. Simple search: Transcription Factor and Organism=Homo'
add ruby setting
add ruby settings
added UserData.Address()
revision de plantillas de archivos y arreglos de conversion de tamano de iamgenes en slide
Convert the Trace.session field from PositiveIntegerField to BigIntegerField
Merge branch 'master' of github.com:ussi/django-lictor
Created main.c. Full of psudocode detailing step by step how to hard code most of competition.
added projects.
resolved controller bidning on init
Added skeleton for EJB
VXS CMN: Add the IPagedEnumeration and IEnumerable extension that returns a paged enumeration.
Added API handlers.
Complete code base added.
Cleaned up allocation.
Removed dependency on GLU
copy modified
temp save functionality added
docs added to save function
Temp save working properly
test cases for temp save
more corrections
Merge pull request #176 from vijaym123/tempcopy

Save images temporarily with more options -- looks good
port 8000 only in dev
trying to muck with submodules
deleting socket.io submodule
adding new socket.io submodule
socket.io-client submodule
minor update to include num of malicious neighbors
pseudo functional flat view
add compass stuff
compass styles used
style applied
cosmetic tweak
some flat highlighting
changed product page for phone
bug-fix: handle non ascii strings in export csv
Merge pull request #7 from rohitg1/exportcsv

bug-fix: handle non ascii strings in export csv
a lot of errors to go
correcting the external-DataView handling
inline docs for navigate.php
Htop config location changed, locale script added
add css twitter bootstrap
tweak xmobar, vimperatorrc
change to focus follow mouse
add mutt keybind, alias mv to ask before overwrite
update README
make mv, cp, ln interactive. add convenience commands to zshrc
tweak xinitrc; make urls clickable in urxvt
fix issue with mutt keybind
use grml-zsh-config for zsh config
tweak vimrc, tweak tex doc snippet
Began smoothing connections.
Added Lisa's portrait.
Added Missy's portrait.
use subl for most tasks
Precompilados
Corrigindo erro de direcionamento
jshint
Update for latest stylus-images library
Update for new stylus paths
Update for stylus-image caching with mixins
Update for stylus-image caching with mixins
Whitespace
Allow file config independent rebuilds

Adds isPrimary flag to the file config. When true this will rebuild all
configs for a given mode. When false will ignore changes to the inputs
when undefined will continue the default behavior of separate rebuilds.

This is intended for plugins that need to reduce the amount of
duplicated work from different configs, i.e. the stylus plugin.
Update stylus for single-pass density handling
Update mocha to latest
Add debounce to cleanup watcher results slightly
Single global namespace for js
After adding JSON library and switch jquery lib to not minifield.
resolved c/p error
Update Mercurial requirement to version 2.2.1.
Merge pull request #77 from davehunt/issue76

Update Mercurial requirement to version 2.2.1. Fixes issue #76
config autoload database
Automated the "npm-package" template
Minor edits to the example web service
use BufferUsage.WriteOnly for BlockMesh.
freeze InterBlockMesh's vertices and indices.
Rename ModelCriterion to Criterion\BaseModelCriterion

Refs #41
Move MODEL_CLAUSE and MODEL_CLAUSE_LIKE logic to specialized ModelCriterion classes

Refs #41.
Move MODEL_CLAUSE_SEVERAL logic to specialized ModelCriterion classes

Refs #41.
Move MODEL_CLAUSE_ARRAY and MODEL_CLAUSE_RAW logic to specialized ModelCriterion classes

Refs #41.
Rename BaseModelCriterion to AbstractModelCriterion

Refs #41.
Fix Bad Criterion subclass names.

Refs #41.
Fix CS on new Criterion classes.

Thanks php-cs-fixer!

Refs #41.
port propelorm/Propel#357 fix fix a wrong var name
Merge pull request #280 from jaugustin/port-pr-357

port propelorm/Propel#357 fix fix a wrong var name
Add unit tests for all new ModelCriterion subclasses.

Refs #41.
Refactoring AbstractCriterion classes

Refs #41.
Change constructor signature for new ModelCriterion classes

Refs #41.
Refactor ModelCriteria instaciation of ModelCriterions

Refs #41.
Remove AbstractCriterion::hashCode() (unused)
Final cleanups and optimizations in ModelCriterion logic

Refs #41
Merge pull request #282 from fzaninotto/specialized_criterions

Specialized criterions
Fix SQLitePlateform again
Archetype now has a test List Fragment.
color changes for entities
modified:   setup.py #Changed pyfits requirement to >=1.3
	modified:   src/chimera/instruments/astelco.py #Fixes
adding index.jag
Merge branch 'master' of https://github.com/wso2/Gadget-Server
adding new gadgets to index
Merge branch 'master' into asset-store
refactoring admin ui for caramel
adding new menu icons, letting user select gadget position in dashboard UI
viewcontroller
merge conflict
adding gadgeturl list for dashboard
Merge pull request #2 from Madhuka/master

adding list gadget url for dashboard
Created gh-pages branch via GitHub
hm
added styles and scripts
docs
more demos
fixed data of tv_denoise result images with float datatype to be in default range [0.0:1.0]
新加定时器撤单翻译
converting Anidcore into a Pico module
Added compression to all the json generators and objects serialization
+
#fixes
+
#updates
Sun Nov  4 03:01:02 CST 2012
Wed Dec  5 15:01:02 CST 2012
Add new road elements
Added scripts for manage company and more
テストです。コミットできるかな？
遍历，强行做，没有任何优化。。。
Moved zales to toyota
识别图片
Added edit page
only signed in users access edit and update user
require user signed in to edit
user can edit his own details only
add index show
added kaminari paging
Done with user edit/update, index and destroy actions
Ajuste no diagrama, criado o campo complemento no Endereco e tipo na Entidade
Atualização do EntityFramework
Remocao de arquivos desnecessarios para o versionamento
Adicionado o .gitignore
Adicionado arquivo ao .gitignore
Remocao de arquivos desnecessarios para o versionamento
Movido as classes do Membership para a pasta Models\Transporte
Criacao do DbContext e Migracao
Criacao do Model e Views do Endereço
Criacao do Model, Controller e View do Centro Administrativo
Criação do Model, Controller e Views das Entidades
Criação do Model, Controller e Views dos Membros
Criação dos links para Centro Administrativos, Entidades e Membros na página Home
Mise en place d'un CRUD Simple pour les salles.
Merge pull request #24 from ybonnel/crudAdmin

Mise en place d'un CRUD Simple pour les salles.
add redirect if user tries to visit project that does not exist
version bump for re-upload to hackage
add exit functions
probando mergetool
Merge branch 'master' of github.com:ygoldfrid/CrossFit
first commit
first commit
second commit
third commit
first commit
tweaking Atom view
add backend title
make some backend inputs wider
backend library/edit database list as ul not select
make subjects sortable
Issue 823: includeSoftDeletes with included argument

See ticket at http://code.google.com/p/cfwheels/issues/detail?id=823
add title, fix aiLibrary.getProcess
Небольшие правки комментариев удаление лишних строк
add js for html5 in ie
add play again in game over scene
Add logo design file.
Add favorites.
The basic function of favorites complete.
update manufacture page
Branch devel-0.21
Support <netinet/in.h> in freebsd7
Update lib/gmp-ocaml
Remove unnecessary MPC-ocaml binding on build process
Mention git --recursive option in readme.rst
Add --gcc option into demo/environment
Parse "__const", "__restrict" as reserved word and accept "__asm__" in aliased declaration
Suppress some errors for <string.h> in Linux
Fix the header comment as present tense
Suppress error messages that an extended word is redefined
Support <sys/mount.h> in Darwin10, FreeBSD7
Update lib/unicode-ocaml
Remove unnecessary rec and open to suppress warnings reported by OCaml 4.00
add commit lines
zfs test suite fails zfs_acl_chmod_rwx_001_pos
Updated cli app to support access token API authentication.
changed style of tab bar
Add back Rails2-compatible console alias 'co'
Change ,bf mapping conflicting with buffer list ,b
Don't explicitly load plugins [Close #118]
Marky the markdownifier
Merge branch 'master' of https://github.com/skwp/dotfiles

* 'master' of https://github.com/skwp/dotfiles:
  Marky the markdownifier
  Don't explicitly load plugins [Close #118]
  Change ,bf mapping conflicting with buffer list ,b
  Add back Rails2-compatible console alias 'co'

Conflicts:
	vim/bundle/zsh-users-zsh-syntax-highlighting
Init Talend project
automatically turn remove against singular vector into delete
Merge SearchInstructionalMaterials > ZeusStaging

- Merge branch 'origin/SearchInstructionalMaterials' into ZeusStaging
Merge AutomatedTests into ZeusStaging

- Merge branch 'origin/AutomatedTests' into ZeusStaging
Fix hit area for dragging for Material popup

- Fix hit area for dragging for Material popup
Merge AutomatedTests into ZeusStaging

- Merge branch 'origin/AutomatedTests' into ZeusStaging
Merge SearchInstructionalMaterials  >ZeusStaging

- Merge branch 'origin/SearchInstructionalMaterials' into ZeusStaging
Merge origin/AutomatedTests into ZeusStaging

- Merge remote-tracking branch 'origin/AutomatedTests' into ZeusStaging
Refactor search controller

- Refactor search controller as per feedback from Concord.
Merge SearchInstructionalMaterials >ZeusStaging

- Merge branch 'origin/SearchInstructionalMaterials' into ZeusStaging
Fix UI issue in site notices

- Fix UI issue in site notices
Fix Class setup message display

- Fix  "Teacher not found" for Class setup
Merge AutomatedTests into ZeusStaging

- Merge branch 'origin/AutomatedTests' into ZeusStaging
Merge AutomatedTests into ZeusStaging

- Merge branch 'origin/AutomatedTests' into ZeusStaging
Merge LeftPane into SearchInstructionalMaterials

- Conflicts:
    public/stylesheets/scss/search_materials.scss
Center align popup for "Assign to Class"

- Center align popup for "Assign to Class" in Search materials
Merge ClassSetupInfoPage into ZeusStaging

- Merge branch 'origin/ClassSetupInfoPage' into ZeusStaging
Merge SiteNotices into ZeusStaging

- Merge branch 'origin/SiteNotices' into ZeusStaging
Merge SearchInstructionalMaterials > ZeusStaging

- Merge branch 'origin/SearchInstructionalMaterials' into ZeusStaging
Merge AutomatedTests into ZeusStaging

- Merge branch 'origin/AutomatedTests' into ZeusStaging
Modify In Progress students table UI

- Modify In Progress students table UI in
  Recent Activity page
Modify feature test for full status page

- Modify feature test for full status page to accomodate UI changes
  suggested by Concord.
Rename site notices tables and DRY the controller.

- Rename site_notices, site_notice_roles, site_notice_users,
  notice_user_display_statuses prefix with "admin_".

- Use "before_filter" pattern to specify the requests available only
  to admin and manager.

- Add foreign key associations.
Merge branch origin/SiteNotices into SiteNotices

- Merge branch origin/SiteNotices into SiteNotices
Add messages for various Recent Activity cases

- Add messages to the Recent Activity page for various cases
  like no offerings, no students or no student activity.
Fix progress table UI for Recent Activity page

- Fix progress table UI for Recent Activity page as per
  feedback from Concord
Merge branch SiteNotices into AutomatedTests

- Merge branch SiteNotices into AutomatedTests
Merge branch RecentActivity into AutomatedTests

- Merge branch RecentActivity into AutomatedTests
Merge branch RecentActivity into AutomatedTests

- Merge branch RecentActivity into AutomatedTests
Updated the link for the GitHub banner.
update cal price
ignore object id and add query regex
Disregard the part about the min-width .move, I was wrong.
add to Graph.lib
2012/04/29/IRC
2012/04/29/Twitter
Got rid of redundant code in decrypt(function).

Now it just reverses the key and calls encrypt.
Refactoring.

Throwing away useless debug `print` lines, etc.
Switched to PolynomialSequence() instead of deprecated MPolynomialSystem.
Use uri to preserve compatibility with the old RDF parser.
Skip attachments that have parent items.
Merge pull request #379 from aurimasv/RDF-attach

Fix for RDF attachments
refine logs
third commit
test commit
Merge branch 'master' of https://github.com/zweiflamme/gittest
test
Much simpler function and add rank in mustache
Add sources for jquery.vticker in order to slightly change it
Better info
- Fix wrong ID's BUG
- Remove debug prints
only use IAM roles from now on
wtf
fixing merge
Move comments to tomdoc.

Signed-off-by: François de Metz <francois@stormz.me>
Extract the method to handle headers.

Signed-off-by: François de Metz <francois@stormz.me>
Include the Accept header with value text/event-stream by default.

This a requirement for some EventSource API. It should not break existing ones.

Signed-off-by: François de Metz <francois@stormz.me>
- change modal wiondow for better performance in firefox
- fix a bug in the update function of a form
Webform test
Implemented gallery option.
Users can crop picture from gallery
Add mobile friendliness

* Set viewport zoom level
* Add MQ's to hide wrap/box-shadow on tables and forms
Player-Dummy added
Moved the insertion/deletion of rows/items to a signal/slot mechanism. It's not fast enough due to it still locking up the main thread when *emitting* the signals but it's faster enough for now.
Started work on the threading section so I can offload the insertion/deletion of rows/items to a thread
Rearraged pro file to stop vtable errors
more work on the external threading
Added new mockups for file search screen.

The file search screen would follow the same guidelines that we have for the
Employee listing and the Applicants listing, except that in the results, instead
of displaying results in a card-listing mode, it would be a linear listing of
documents. The documents should have an icon to display the document type, a
title and a description which would be parsed out of the document.

If possible, it should also display the information relevant to the search that
made the file match a specific search.
Choosing source
conflict
imagenes agregadas
up

nada importante
ability to write files complete
more work, not sure what i did
updated the gitignore to ignore the testing files
beginning work with eval and exec python calls to allow for more advanced functions
Debugging why email_status isn't working
Remove unused variable
Removed non-functioning tasks
brought pictures back to mobile home
use cert based on the environment
* also, log to stdout if no logging is available
Memory usage no longer includes Buffer or Cached RAM
Memory usage text no longer includes Buffer or Cached RAM
Merge pull request #2 from VeoPVM/master

Sending a pull request
Remove IRQNoFlags from RTC
Removed extraneous close
Revisions to README file.
readme mars rovers
minor
Merge branch 'master' of github.com:BryanApellanes/Core

Conflicts:
	bam/resources/js/admin.js
	bam/resources/js/bam.js
color admin, eazel.edit, moved ProxyAttribute to Bryan.Apellanes
Upgraded the SlackBuild for node.js from Audrius Kažukauskas' hg repo on
bitbucket.org in response to the security vulnerability reported in node.js
last week.  v0.6.16 is said to be immune to the vulnerability in question.
If need be we can update it to the v0.6.17 or later just to be safe.

Vulnerability disclosure:
    http://blog.nodejs.org/2012/05/07/http-server-security-vulnerability-please-upgrade-to-0-6-17/#comment-2285

This is the commit that fixed the vulnerability:
    https://github.com/joyent/node/commit/c9a231d

Signed-off-by: The Doctor <drwho@virtadpt.net>
support GET and POST
test
weekly almost completed,
daily still some small problems
Merge remote-tracking branch 'origin/master'

Conflicts:
	tyonn/src/Cal.java
blub
kj
Merge remote-tracking branch 'origin/master'

Conflicts:
	tyonn/.classpath
	tyonn/src/Cal.java
	tyonn/src/de/michel/mysql/readData/MySQLConnection.java
Fixed header.
Cleaned up header width on large screens. Made header not fixed on small screens.
Testing image in header.
Added test.jpg to project.
Centered header image.
Reposition header.
Font change. Copy change.
Restyle and center article images.
Fix nav to top. Redo header type size.
Side bar color, add Candor graphic.
Redesign sidebar, Projects. Remove sidebar-toggle.
Move title h1 to nav.
Restyle post headline and meta.
Bring h1 back. Restyle.
Style sidebar. Underline nav links. Color comps.
Style footer, fix sidebar width, style search.
Adjust pre colors.
Move RSS link. Adjust search position.
Style and graphics for sidebar.
Favicon.
city data refactoring, tactics, projects changes
city data refactoring, tactics, projects changes
Insert course sql
Merge branch 'master' of https://github.com/CarolineM/CS304Prog
added a new testfile for testing the piano with mock up
added DirectoryTest
test midisounds
Initial changes to names.
- change %s to %S in get_date
Fixed id attributes in menu items. Added twitter colouring to config_default.php.
Core/AI: Removed EventAI handling. is not needed more for cataclysm...

move a sql to correct place.
big update

adding all types of questions
fixing some questions => more work needed
begining of the score computation
add package file for easy chrome install
[LocalPod] Fix public headers handling. #449
[LocalPod] Completed fix for public headers handling. #449
Add support for universal-darwin10.0 via st.h check.
Merge pull request #25 from phillbaker/universal-darwin10.0

Add support for universal-darwin10.0 via st.h check.
Removed name from package details.
Moving message relay logic into its own class and out of the global.asax file
Исправлена ошибка в ActiveForm
Правки для совместимости стандартам ZF
Добавил класс для осуществления XSLT-трансформаций
Added client-side privileges.
Fixed bug with serializing NHibernate entities: don't do it!
Added checkbox so people have to agree with the terms before registering.
Merged the CZ-Support repository.
Restructured project.
Work in Progress
update file /client/default/js/prefs.js
Fixed the README, not like it's all that huge to begin with
add GA; add Worker Runner (not tested);
Merge branch 'dev-francis' of github.com:Crowdpark/processus into dev-francis
Merge branch 'dev-francis' of github.com:Crowdpark/processus into dev-alexander
Remove themes folder
Added .gitignore for themes folder
Fixed checking of missing files and mapping of columns for non-ascii characters.
Added monadic ErrorHandling, fighting with an intellisense bug
Upgraded to newest jQueryUI version
Dynamic code creation -DONE-
- jQuery UI updated

- files removed
Fix to: http://jira.diamond.ac.uk/browse/DAWNSCI-279
Updated version of gda extension bundle in manifest
Emiting ext-model config
Aggiunte Immagini

Aggiunta immagine win7 LOGO.jpg
titles are links
Updated style for widgets.
Last version
Last version
Last version
Created  Hello.html
Added 3Branch
Last version
Last version
Last version
Last version
Last version
Last version
Last version
Last version
Merge remote-tracking branch 'origin/3Branch' into SecondBranch

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/SecondBranch' into SecondBranch

Conflicts:
	index.html
fixed problems with waypoint-copying
расширенная теория вроде готова ну и пофикшино пару ошибок
Merge branch 'master' of github.com:EPecherkin/Exams_v2
Merge branch 'master' of github.com:EPecherkin/Exams_v2
теория готова вроде и ошибок несколько пофикшено
Improved station view
Front page fixes

- Added wt.avg
- Dimmed colors
Quicklook overhaul

- Restructured layout of both general and regional quicklook
- Modularized ask/bid tables
- Removed input boxes from graph
Added bootstrab datetime picker
Moved item rendering to Item.onAdd event handler if item is added
Checked issue with method show() in Google Chrome
[Tests] Added checking defaultAvatar key
slipt page
get the recent posts' data.
add the recent post widget.
modify the a link
Hook command block up to ConsoleCommandSender. Fixes BUKKIT-2684

This will need to have its own CommandSender but this makes command blocks
work for now with any command console can run.
Spigot changes.
Fix metrics and spamhaus
Scratch folder for random stuff, list of functions in standard libs of Python, octave, R, and Julia
First implementation of transfert, not bad
tests
Merge branch 'master' of https://github.com/EriksRemess/pineuro
implemented specifying custom peer id provider for p2p client
implemented AzureusStyleIdentifierProvider
cleanup
refactoring for MagnetLink class
change property to PWBF
code cleanup
code cleanup
set .NET 4.0 version for assemblies
cleanup for various classes
cleanup for various classes
DHT project cleanup
recurse fix
added deserialization method to FastResume
do not write ignored files from torrent on disk
cleanup for FastResume class
refactoring for clearer look
refactoring
refactoring
applying code style
applying code style
with debug
Merge branch 'master' of https://github.com/Evangenieur/hvid.io
second search issue corrected
Add bylaws, so we have it here, too
Commit Mainupdate2
Merge branch 'master' of https://github.com/Fabinout/Middleware.git
Support readln on MinGW by providing stdin/stdout
add std.parser: a basic recursive-descent parser (the same model as fcc itself uses)
use addrspace(1) for pointers to prevent special handling of null (llvm workaround)
assorted miscellany!
implement scoring for implicit casts so we can automatically select "preferred" casts
Implement cross-platform line numbers and SEH-based exception handling under windows
Return a better expression for "this" in rel lookup
Sometimes dare to parse a template twice if it's already parsing and we urgently need to resolve a cyclical dependency. Only try this once though. (This fixes combined use of join() and readback().
Allow multiple statements for top-level mixins
zjgjghkjghfjkf
fixed html5 video
adding reputation gained per session to LDB plugin. fixes #9
changed colors in LDB tooltip for session reputations
added testmode check to debug code in LDB plugin on mouseover
Writed myself lib for working with inline callbacks. ("async module")
Fixed bugs.
Adding comments and cleanup of period on POST
Fixing preferences model, adding eval for PHP short tags in PHP5.3 with short tags disabled, first part of authentication controller
Files from past commit
Bug Fixes: Adding Post, Deleting Post, URL Module Proper Naming
v0.2 of SiteSense\!
making UChainGUI look better in Qt

removed scrollview border, made margin correct for scroll bar
making UdefListView look better in Qt

part 1: removing scrollview border
change "UDefs" to "Udefs" in UdefListView and UMenuBar

because that's how it is spelled
correct scroller margin for Qt in UdefListView
changes in jaxb schemas
fix IPv4/v6 <-> string translation code for WinXP and below (rather: any Win32/64 platforms before Vista)
makefile: pass COPT compile defines, etc. to mingw build as well!
whitespace 5-0
moved mg_connect() to mongoose_ex, cleaned up mg_pull() to be minimal code
make sure connections established through g_connect() can use mg_read/mg_write: these connections are assumed to be 'arbitrary', i.e. the mg_read() internal logic regarding limiting read() return sizes to the HTTP request Content-Length is disabled.
fixing issue 361 as per suggestion: http://code.google.com/p/mongoose/issues/detail?id=361
IPv6: better portability check for inet_ntop et al + fix compiler warning about initialized var in handle_cgi_request
Merge branch 'master' into chunked-transfer
updated HTTP status codes list
another wee bit of preliminary cleanup
system links has "me" type

replaced obsolete "unsubscribe" and "change_details" types
taoeaten
AST_3D Version BackUp
initial commit of jordan-manifest
add repos required for releasetools
cleanup
switch to own gonk-misc repo
Merge remote-tracking branch 'mozilla/master' into jordan

Conflicts:
	default.xml
add jordan.xml
Merge branch 'master' of github.com:GodFox/b2g-manifest into jordan
Updated version from 0.3.1 to 0.3.2

Version updated from 0.3.1 to 0.3.2, and changed the indent from 3
spaces to 2
Moved JS code from the page to a JS file

Moved JS code from the page to a JS file due to "inline-script"
permissions. Also changed how options are saved, instead of sending a
chrome.request, now it saves directly to the localStorage.
Adding default .gitignore because Thumbs.db
GM script now compatible with older versions
Adding description to text version section of admin
Removing saved vars.
Made the coins a bit more noticeable.  Outputs gold amounts after selling.
Ajout du flexform
minor fixes for display of tree node relatives
Provide a simpler method for logging.
partial top 10
An implementation for Not
An implementation for And
An implementation for Or
An implementation for Xor
An alternate implementation for Xor
An implementation for Mux
An implementation for DMux
Implementations for the multi-bit variants
Check the return code of hb_audio_resample_update(). This allows us to log an error when it fails, so we know which decoder actually called the function.



git-svn-id: svn://localhost/HandBrake/trunk@4904 b64f7644-9d1e-0410-96f1-a4d463321fa5
declpcm: modify hdr2layout.

AV_CH_LAYOUT_STEREO w/7 or 8 channels is invalid anyway, and will get sanitized in hb_ff_layout_xlat(). Doing it in declpcm directly avoids an unnecessary call to that function, with identical results.



git-svn-id: svn://localhost/HandBrake/trunk@4905 b64f7644-9d1e-0410-96f1-a4d463321fa5
Merge branch 'master' of git@github.com:HandBrake/HandBrake
WinGui: Convert the Presets Panel to a Listbox and update the styling. This should better reflect the selected preset and cleanup the horrible toolbar styling for the button controls.

git-svn-id: svn://localhost/HandBrake/trunk@4741 b64f7644-9d1e-0410-96f1-a4d463321fa5
Merge branch 'master' of git@github.com:HandBrake/HandBrake
libhb: fix comb detection crash and decomb crash
hb_detect_comb() could crash because the dimensions of the video buffer
don't have to match the dimensions returned by work object info() method
if the video has segments of differeing resolutions.

decomb was allocating reference buffers that were too small.  This bug appears
to have always existed but doesn't usually get triggered because malloc
usually rounds allocation sizes up.


git-svn-id: svn://localhost/HandBrake/trunk@4812 b64f7644-9d1e-0410-96f1-a4d463321fa5
Merge branch 'master' of git@github.com:HandBrake/HandBrake
Added kien's ctrlp addon
Mode test SVG
use regexs instead of looping
Tilt effect at main menu
bump version to 2.0.0.pre5
check buffer == null. when a frame is already in the buffer it must not be changed
implement setimagetype
buffer underflow??!
Add initial error trapping support.
Add error examples.
Minor style updates.
Updated built files.
Initial version. No tests.
README-Change
Created IE and not found page
Changed how we get objects.
File cleanup and moving around
Merge pull request #2 from JLepeltier/tube

Rename Video to Tube
Add Spotify
bar
bars
Merge branch 'butterfly' of https://github.com/TBEDP/datavjs into butterfly
refine bar chart
refine bar chart
changed encoding
data changed
Merge branch 'butterfly' of git://github.com/TBEDP/datavjs into butterfly
changed the legend
legend
deleted bar_source.html
Merge branch 'butterfly' of git://github.com/TBEDP/datavjs into butterfly
add bar_source.html
deleted column_source.html
Merge pull request #78 from gozo1234/butterfly

two bar files added
Merge branch 'butterfly' of git://github.com/TBEDP/datavjs into butterfly
force
docs changed
docs changed
docs changed
Update Jahia dependency version to 6.6.1.0
finally fixed sysrestore [n18]

ready for backup
fixing up user info in sysrestore
desgin + database
Uploading PyroCMS
Renamed all 318 'above-tiles' back to their md5(hash) form until I know how I'm going to handle above-player animations.
Reverted collisions.php back to how it was before it was altered to rename tiles in the above-tiles folder.
Ignore new media files (duplicates from mapper folder)
Removed used index.php (from README as well); Removed unneeded comments on animations from README
Removed tilesheet-from-map.php because no longer used for anything (removed reference from README also)
Removed reference to non-existant file above-player.php; Added information about adding entities and 'above' tiles to collision.php
Added description to README of map-placement.php
Touched up a several file descriptions in README; Added descriptions for generate-map.php and merge-maps.php
v0.3.2
Replace send with __send__
Makeup optimization
made it so the steps show on the output
the final final fix
Updated to 1.0.3

Changed %F to %ArgIn% (To avoid file name errors from uTorrent)
Outlined hash.ads and updated README
Add full results to MapNotes for location data.

This change adds the fullLocationResults iVar to
MapNote.  This allows a request to have the
full results returned for any non-Kinvey Location
provider.  This is good/bad, since you can now
explore the dictionary to get specific information,
but you can also now break the portability
of the DI classes.
random in results
hopefully all of the files that usually messed up pulls and commits are gone now
Attempting to make sure that the view controllers are not created before the user logs in, just in case...
added todo document
机票详细
解决冲突
1. Add a instructors' name under a course name. 2. Try to add a instructor's career but not yet finished.
Merge branch 'master' of github.com:LarngearTech/Zelfer
+ JSF
+ JSF
Correction in API documentation
SRM543-Div1 1/3(2/3 after competition)
added a prompt to the end command.
Plugins (madspin): Port to OpenGL ES. Particle sizes are wrong for some reason
Plugins (common/GL): Remove private implementation of glOrtho(), use glOrthof()
Plugins (Build): Rename GLU replacement library to miniGLU to avoid potential confusion
Core: Replace NULL with nullptr, use new delete syntax to disable copying, and replace LV::ScopedPtr with std::unique_ptr
lots of changes
cleanup
Monster armor.
Cleaned up printui

Misnamed icon in cfg file.
And class variable names didn't follow convention.
Add a simple main window
fixed bug in 2ndsystem-detection
Create flag.rake
Naming threads.
Added Arcade system plugin
Avoid analog events latency.
Merge branch 'master' of github.com:OpenEmu/OpenEmu
Merge branch 'master' of git://github.com/OpenEmu/OpenEmu into PSX
Keeping up-to-date.
Conflicts:
	OpenEmu/OpenEmu.xcodeproj/project.pbxproj
Add examples for each case and deleted extra class
Removing functionality from Lidalia Lang where it exists in Guava or elsewhere. Meeting coding standards.
Remove Extra Codes!
Add fix class to noise and backimg divs!
Add style for section.container!
Add z-index to Header and Footer!
Add style of section.leftside
Add fix class to leftside!
Change Template!
Add badboy li ( only for IE )
Merge remote-tracking branch 'origin/master'
Add badboy Elements ( Only for IE )
Command line editing
Typo Removed: Prize
hostname pris en compte dans Client.py.
extract timeline con color
Add Replied To table Profiles
a view to show student data to teachers
Updated translations
Minor UI Fixes
Use local JRE for building

Signed-off-by: Meldanor <Bhaals@gmx.de>
Remove target from git repo

Signed-off-by: Meldanor <Bhaals@gmx.de>
Added default message and permission node.
Initial parser for per-item config.
Edits to config and listener.
install scripts: don't get my gpg key
gpg.conf: be verbose
Make adding enchantments unsafe
MODE-1631 - Fixed the ISPN configuration of the performance tests and some of the tests themselves
Replacing more instances of JSON and JSON::Any

- Looks like my grep pattern missed cases where
  we weren't properly calling "use JSON" or "use JSON::Any" before
  we used those libraries.
Merge pull request #99 from ModelSEED/use-json-xs

Replacing more instances of JSON and JSON::Any
Added function sign.
Added function sign. Improved construction.
added existing project
Merge branch 'master' of github.com:Mustack/ML-Forestry
add a note about versioning to README
add build status and version info badges to README
improve sublet :clock date format
improve subtle views
add tag R for subtle
improve image tag in subtle
add chmsee program into subtle read tag matching.
updated mutt mailboxes, index_format, etc
update neosnippets
update repo .gitignore
fix XIM, IM program environment variables
update neosnippets
add SQL ftplugin for vim.

Auto convert SQL keywords into uppercase when in insert mode.
add plugin to show indent lines with vim73 conceal feature
Merge branch 'develop'
add R language profile for initial load libararies
improve hlsearch mapping
Merge branch 'develop'
use very magic regex for / and ? searching
adjust vimrc and add plugin vim-autotags
increase mutt sidebar width
adjust indent of vimrc and format vimrc
add plugin ref configs and usage comments
Merge branch 'develop'
added a little about bombs
fixed a transposition bug in jw
refs #1320 : menu flickering fixed.
refs #1586 : merge with 1.9 tree
 refs #1544 : some markups are modified.
proof of concept island -making
Add es5-shim v2.0.2 in order to fix IE8 / IE7 compatibility.

See:
- discussion on mailing-list: https://groups.google.com/d/topic/amber-lang/EOlsvFd5ynk/discussion
- es5-shim: https://github.com/kriskowal/es5-shim/
fix es5-shim for amber integration
Merge pull request #244 from lolgzs/es5-shim-integration

Es5 shim integration
Scheduler tweaks
iosched: prevent aliased requests from starving other I/O

Hi, Jens,

If you recall, I posted an RFC patch for this back in July of last year:
http://lkml.org/lkml/2010/7/13/279

The basic problem is that a process can issue a never-ending stream of
async direct I/Os to the same sector on a device, thus starving out
other I/O in the system (due to the way the alias handling works in both
cfq and deadline).  The solution I proposed back then was to start
dispatching from the fifo after a certain number of aliases had been
dispatched.  Vivek asked why we had to treat aliases differently at all,
and I never had a good answer.  So, I put together a simple patch which
allows aliases to be added to the rb tree (it adds them to the right,
though that doesn't matter as the order isn't guaranteed anyway).  I
think this is the preferred solution, as it doesn't break up time slices
in CFQ or batches in deadline.  I've tested it, and it does solve the
starvation issue.  Let me know what you think.

Cheers,
Jeff

Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
regulator: max77686: make max77686 less chatty. we can use dynamic_debug later if we need these debug messages
mach-exynos: cpuidle-exynos4: set logging default to disabled
midas-tsp: make touchscreen actions less chatty
Finalized variables.
Add blue5g6.3 board structure.
修改前端列表页审核状态
merge
Transferred old files
Do not automatically create schema based on jpa annotations. Schema creation is supplied in Flyway migration now.
installer: allow selecting components in silent installation

/SELECT_TAP=1
/SELECT_UTILITIES=0
/SELECT_SDK=0

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Added a function to find groups and remove them.
Fixed test case due to upstream changes.

  - Removed dependency on paste.httpexceptions.
added a couple of zsh aliases, wrapped prompt in a function to allow for quickly changing the prompt, and temporarily removed the double-sourcing protection on .zshenv due to a few odd bugs I couldn't figure out.
major organizational changes to vimrc. cleaned up and added some small things too
added some maps to vimperator to make it behave a bit less like firefox
added git-hardlinked.sh for automatically hardlinking files in this repo for certain commands
update
bugs fixeds
Next part of imagesed from production added
Updated report :)
Nice green selection-glow, buffer contains more information, paintGL
fixed a bit.
Merge branch 'master' of github.com:PongUIO/AndroidWars
fixed merge conflicts tonyest to brent
fixed fucked merge
inserted filter to pp-auction-system.class.php 'bid_form_fields_pre_input' that allows for insertion of custom bid_form_fields before bid-input tag. Includes  as additional argument for accessibility during ajax calls.
fresh clone from master with added bid form filter
resolved conflict
Merge pull request #72 from tonyest/master

Add filter to bid_form to allow customisation?
finish first pass at plot printing code. New files in the image folder.
Added a quadtree
Fix bug trying to respond when pushing a list of jobs
adding keywords and description meta tags
Update src/RelayAdder.java
group and user invitation works now
Fix invalid configatron reference
initial commit of vagrant plugin
refactor vagrant shelf creation logic
add Vagrant plugin configuration class
update generator to include berkshelf configuration information
add explicit require for 'berkshelf/vagrant' to top of generated Vagrantfile
add automatically loading vagrant_init file for Vagrant plugin
add vagrant gem dependency
Merge pull request #119 from RiotGames/vagrant-plugin

Vagrant plugin
Undo rename of BERKSHELF_PATH to BERKSHELF_DIR
Center method works with scaling now

Will probably make it work with other drawables later
9+ à la place de 8+