labofsahil/github-event-dataset-2012 huggingface dataset:
sumo: fix license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98515 d073be05-634f-4543-b044-5fe20cf6d1d6
gnucash: add icu dependency and bump revision


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98516 d073be05-634f-4543-b044-5fe20cf6d1d6
gnucash-devel: add icu dependency and bump revision
[merge r98516 from gnucash port]


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98517 d073be05-634f-4543-b044-5fe20cf6d1d6
p5-crypt-passwdmd5: fix configure failure by converting Makefile.PL to UTF-8 (#35420)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98518 d073be05-634f-4543-b044-5fe20cf6d1d6
omniEvents: whitespace changes; add modeline


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90758 d073be05-634f-4543-b044-5fe20cf6d1d6
libut: whitespace changes; add modeline


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90759 d073be05-634f-4543-b044-5fe20cf6d1d6
libut: fix livecheck


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90760 d073be05-634f-4543-b044-5fe20cf6d1d6
fuzz, libcddb, libut, ode: rewrite master_sites to avoid redirects


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90761 d073be05-634f-4543-b044-5fe20cf6d1d6
msp430-binutils:
Resolved ticket #33619


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90764 d073be05-634f-4543-b044-5fe20cf6d1d6
msp430-gcc:
- Updated maintainer address
- Updated to use crossgcc subport


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90765 d073be05-634f-4543-b044-5fe20cf6d1d6
msp430mcu:
- Updated maintainer address
- Added missing conflicts: command


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@90766 d073be05-634f-4543-b044-5fe20cf6d1d6
Added some error checking for the P4 calls.
Cleaned up some of the change list logic in create()
Ran PyCharm's code formatter on rb.py.
reverse engg xml java updated
Merge branch 'master' of github.com:samarjit/BEIadt

Conflicts:
	src/com/ycs/fe/util/ReverseEngineerXml.java
reverse engg
tex snippets
gitigore: core
Rename directory.
Rename $fpath.
Add submodule: curl completion.
Generate init file.
Create setup script.
Add ignore file.
Fixed issue with column updates when changing max status number per column. Improved fetch status avatar
Making some changes on the status layout to adapt new Twitter rules and improve user experience
Enabled retweet (working on quote)
Merging changes with turpial branch
Working on fav button and fixing new structure in gtk
Merged changes with development branch
Fixed minor issue with image preview. Added link to see user avatar from profile window
Fixed hardcoded path on unity daemon
Fixed issue quoting tweets
Imageview resized to image real size
Merge remote-tracking branch 'origin/status-layout-changes' into development
Add the {% poll <poll> %} template tag that automatically generates all of the required html to display a poll on the
website.
fortune: fix typo

Closes #12463.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
lame: add universal option

Useful for Audacity and Mixxx, which both want libmp3lame but need i386
binaries.

Closes #12460.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
nasm 2.10.01

Closes #12458.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
mysql 5.5.24

Closes #12459.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
ffmpeg 0.11

Closes #12439.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
exiftool 8.93
subversion: add back UTF-8 hack.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
subversion: style nits
git-ftp 0.7.4

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
mosquitto 0.15

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Merge branch 'master' of http://github.com/mxcl/homebrew
hub 1.10.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Merge branch 'master' of http://github.com/mxcl/homebrew
exiftool 8.94
moreutils: install 'chronic'

Closes #12809.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
xdelta fails with clang
subversion: --perl fixes, no clang and find EXTERN.h correctly

This will find EXTERN.h correctly even if the user has installed a
custom perl installation, such as from perlbrew.  See #11619 for a bit
more info.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
unrar 4.2.3

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
redis --devel 2.6.0-rc4

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
ht 2.0.20

Needs a patch now in order to link ncurses instead of ncursesw, as
upstream switched to link ncursesw.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Allow --get for non-interactive builds.

This is useful for doing a --debug build, as the git repo will pick up any
changes that have been made up to that point in the build process.

--git is still most useful in conjunction with --interactive, though.
par2: update patch url

Closes #12824.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Merge branch 'master' of git://github.com/mxcl/homebrew into tiger
Initial (fully working) Android NDK commit
Merge pull request #13 from aking/android

Initial (fully working) Android NDK commit
Adding some configuration to remove all the hardcoded pem file locations
SCI: Add a workaround for QFG4, screen 140 (character selection screen)
Merge pull request #23 from scunz/topic/gw_index

GitWrap/Index
Widgets: Add a simple SHA1-Input widget (yet untested)
History: Add Combobox
History: Remember Repo+Commit for details
Second commit
Merge branch 'master' of https://github.com/PolCPP/prueba into PolCPP-master

Conflicts:
	README
commit voor audrey, probleem bij profilesettings gui
deadness when you die
Add 12 bar blues rhythm guitar
Basic drums
Changed PUT and POST
Update nREPL to HEAD of master
Compose work completed and storing in sent item
Fix test failing on 1.9.3-p194
создал тестовый файл
- Parameteränderungen (Geschwindigkeit, Drehwinkel)
- added DomainModell Visio + PDF
added option to execute files from .dfminstall
added --bashrc-load
Query two levels deep
Update Ruby versions
A ga code
F nicer way of evaluating cache
A google analytics
update menu and pathauto module exaction
random map stuff
added kludge to fix code block bug in markdown for mapgen README
Remove now obsolete conn_info lwo
Remove obsolete installation information
Finished help system
Removed obsolete help tests
Reworked banning commands to recognize relative rank
Fix capitalization glitch in subd
Allow wizards to list bans
Use C comments only
Transfer privilege class queries to subd
Home page changes #86
	modified:   app/views/sessions/new.html.erb
	modified:   public/javascripts/jquery.tabs.pack.js
	deleted:    vendor/plugins/restful_authentication.rar
Added ice_apo_pack2 as starting pack
tedttestest
mv login.py to yssy.py
add feature: user can post now
add arsenal news script
rails_config導入
limit_items曜日表示
残日数バー表示
assets precompile
assets precompile
delete public/assets
use <=> for performance.
On tente de lancer zsh en tache de fond
Fix memory leaks due to serial number and product name not being freed properly in get_device_string()
removed various bugs produced in recent commits.
Adds a wider range of Vim swapfile ignores
added several things, including visual studio and waf files for compilation
Remove dijit submodule and add mijit instead
adjust path for modernizr and respond
Histórico atualizado
use UNIX time as default for stat
Minor changes to try to improve some tests that sometimes randomly fail.
update languagefiles from WTI
Don't override exsisting files
Reverted Pre mature merge
Made weather faker restricted...

Added time faker, time faker fakes the time... and i ID MC1237

Happy 600th Build :D
Happy 600th Build!

(Made particle effect restricted)
-RowStyle ändern
Add more goodies to zshrc
Setup.py.
add  add_host action plugin - add hosts to inventory during a playbook
run - lets act on those hosts in the next play
need to use the variabled results
Fix binary file names
added bash_aliases to repo
oppStack compositionizing WIP
merging master into ben
bugfix: rect width height
Adds Xresources
Fixing issues with "Earlier" and "Later" search
Merge branch 'thfi-master'
Add console backend
Update README.md
Add prettyprint option and exclude gauges metric from cache
fix data sampling
reformat keyFlush log into key value pairs
exampleConfig.js: add missing documentation

This commit adds documentation about the *address* and *mgmt_address*
config options.
Allow multiple metrics to be passed in one UDP packet delimited by a newline character.
Fixing white space in a separate commit.
Merge pull request #94 from booo/master

Add missing documentation
Merge branch 'mixu/console_backend' of https://github.com/mixu/statsd
update README mentioning to preferably use ints as values
added sum to all metrics and mean to the total - also changed the way we calculate these metrics by using a cumulative sum as it is more efficient for multiple percentile thresholds
bug fixing, sample_data and data got swapped
update README
Merge branch 'master' of https://github.com/smarden1/statsd
Merge branch 'master' of https://github.com/omniti-labs/statsd
Merge pull request #107 from leonmax/patch-3

bug fixing, sample_data and data got swapped
Merge pull request #97 from sanbeg/master

fix to perl sampling code
Add CLI bash client example
Remove gauge reference
make --with-gearman=... work with custom paths
Bump to 0.0.2 (rename to referer-parser)
Merge branch 'master' into feature/restructure

Conflicts:
	attlib.gemspec
	lib/attlib/version.rb
Pan for user settings
update codemirror, add basic autocomplete, change default example, start the game at load
Use rvm + bundler for fpm

Required for SC build infrastructure, but not exactly portable. We should get
rid of the Ruby dependency.
More manifesto
bind mouse events to document, not window
increased gaps and decreased outer padding
moved general docs to README
Fixing once again
Removed the 'AddButton' function that was printing button names
Replace PHP short opentags with full open tags GH issue #1654
changed: renamed database.php to database.sample.php
Put MARC 016 field into pazpar2 metadata and extract ZDB number from it
Add GBVCat catalogue URL
kretschmer mode witziger
bin updates, add z
remove oh-my-zsh
remove oh-my-zsh
update bashrc
Removed FlatFileBanManager from init until it's fixed/correct

Signed-off-by: Olloth <olloth@gmail.com>
Added some test commands
Fixed the BanManager NPEs and the StorageQueue Bugs in connection with the BanManager.

Signed-off-by: steffen <steffenb198@aol.com>
Format changes for README
Fix binding spec
Version changed in cmake

Signed-off-by: Stephen Cox <stephencoxmail@gmail.com>
Show the state of processed_jobs in the config page
+ x11-libs/qt-meta: Now with gcc-4.6 support
added google analytics tracking code for ibp and wgp
add tmux extension and updated ctags.cnf .
fixed login dialog layout
Merge branch 'develop'
Merge branch 'develop'
version 0.5.1
Merge branch 'develop'

Conflicts:
	structr/pom.xml
	structr/structr-core/pom.xml
	structr/structr-rest/pom.xml
	structr/structr-ui/pom.xml
	structr/structr-websocket/pom.xml
release 0.5.2
Next development iteration: 0.5.3-SNAPSHOT
Allow initial globals to be defined in options
main function in main.c
added usart skeleton
add scripts.test
added a new fixture for hydrusAssemblyWF to get ready for new dor-services gem; remove anything that might be a sunetID from fixtures and update tests
Fixing the position of the sidebar on the item edit view.
Adding flash messages.
Basic validation for publish button enable/disable.
added functionality to share images with posts on FB
5846: selected tag is not displayed in brackets

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@19840 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Update pt_BR translation

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@20433 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Update in disk backend
Fixed selectAll (behaved wrong after delete)
Add js.Lib.typeof.


git-svn-id: http://haxe.googlecode.com/svn/trunk@4270 f16182fa-f095-11de-8f43-4547254af6c6
Inline a couple other things in here too.


git-svn-id: http://haxe.googlecode.com/svn/trunk@4271 f16182fa-f095-11de-8f43-4547254af6c6
added EnumValue (any instance of any Enum)

git-svn-id: http://haxe.googlecode.com/svn/trunk@4254 f16182fa-f095-11de-8f43-4547254af6c6
Updates to the field and content types
Merge branch 'dev' of github.com:syddjurs/os2web into dev
Added AD integration fature
changed server logins and group names from test to real names
cleanup
Merge branch 'dev' of github.com:syddjurs/os2web into dev
Fix
Revert "cleanup"

This reverts commit 2a90cc0c68373273246bfa373a16ceb633426ae0.
Revert "changed server logins and group names from test to real names"

This reverts commit bc06ce0c6326310ac199ffd7deff2dab34f7d13b.
Merge branch 'dev' of github.com:syddjurs/os2web into dev
cleanup
context opdatering
Revert "Testing if I can push to another user's branch."

This reverts commit 5a5b3c5e28908a7bbbc047581ee155747857da82.
Update hardware/LICENSE.txt
Java 1.6 compatibility
stuff
-Añadido el capitulo de diseño y arquitectura
added an exception for the cache if it is full and we cannot evict any blocks
fixed write offset
Fixed bug where and exception would be thrown if

there was not id, url or referer on comment_list
Cfix error in gemspec
Clean application english language moving severals entries in another files
Add submenu language files support
Add pagination translation
User language file is always loaded so changes some entries 'bf_' to 'us_'
Primiä lisää...
Allow svnpoller split functions to override repository and project
Add test coverage for project-branch-file splitter
Add test proving we can override project and repository
Documentation updates
Add release note. Update docs, and rename split_file_project_branches as suggested
Fix misleading comment
Add codebase to SVNPoller
Minimize changes introduced by diff
Use URL as name of object
Parse the failures_only arg correctly for feeds

Fixes #2270 (again).
Doc fixes
fix parameter bug in mailer

Change-Id: I6035589b4699dddf642c2e06eaf9dc6942167bc1

Conflicts:

	master/buildbot/status/mail.py
Merge pull request #487 from pepsiman/master

trivial, so I commit from the UI
Make previous build chioce configurable

When prioritizing build requests in an order other than arrival time,
builds' relative order might not always reflect the topological order of
the changes. This change makes the build order to be configurable such
that status transition modes are only sent out when a more recent
*change* affects the status of a less recent one, as opposed to relying
on the default chronological ordering of the builds.

Change-Id: I2009a8b1f4d093a23ef6eea869567aa54b7987b6
use TCP keepalives on the master, like on the slave
Merge branch 'master' of github.com:buildbot/buildbot
Merge branch 'multiproject-svnpoller' of git://github.com/isotoma/buildbot
Merge branch 'fix-poller-consistency' of git://github.com/isotoma/buildbot into buildbot-0.8.7
Merge branch 'et_fix_bug_mail' of git://github.com/jgonzalezmendez/buildbot into buildbot-0.8.7
Merge branch 'et_prev_build_configurable' of git://github.com/jgonzalezmendez/buildbot
[COOK-421] Escape unintended control tags in templates.
Merge branch 'COOK-421'
Merge pull request #349 from pmorton/COOK-667

Cook 667 Add dougm's shortcut provider
[COOK-1018] - Added support for packages that get built with any as the archtype.
Merge branch 'master' of github.com:opscode/cookbooks
Merge pull request #345 from atomic-penguin/COOK-1051

COOK-1051: Minor fixes to Java cookbook
[COOK-958] - fix regression for loadmodule on debian/ubuntu
passenger_apache2 v0.99.4
[COOK-1072] - set nginx version attribute to 1.0.12
users v1.1.0
fix template not found issue when calling users_manage LWRP

from outside of the users cookbook
add configurable cookbook attribute for users_manage LWRP

used to determine which cookbook the authorized_keys template is located in
Merge pull request #344 from Andorbal/master

COOK-1037: Current version of rubyzip is causing problems.
COOK-1012 Adding support to IIS for creating applications.
Update iis/README.md
Update iis/README.md
[COOK-1012] - dos2unix the files from last commit
[COOK-1012] - markdown formatting in readme
Merge branch 'COOK-1012'
COOK-1028 Adding support to IIS cookbook to run config commands.
refactored and add tests for attribute dependent graph resolution
added tests for character sheet view
added view tests for setting character attribute
Tag cloud
Resolved merge conflicts
Marshalling and Unmarshalling of books
Add client startup exception handling
Add client startup exception handling
Added French (fr_FR)
[Jewelerの使用をやめる] gemをインストールする前に一度tengine関係のgemをuninstallするようにしました。これで毎度バージョンを上げなくてもちゃんとリビルドできます。なので手順は以下の通りです。
$ cd path/to/tengine
$ rake rebuild
$ rake spec
Updated for N2 2.2.1
updated to n2 2.2.1
Updated for N2 2.2.1
Merge branch 'N2-2.2.1-Update' of https://github.com/terfdaq/HereSay into N2-2.2.1-Update
Align cases
Update rake auto-completion to work with lib/tasks
Finished part 6 of the Games from Scratch tutorial

In this part, we implemented the ball we're going to play with, and
movement for the paddle. I also marked locations where I believe
refactoring would be good, and I also deviated a little from the
tutorial when it game to the paddle's behavior and bouncing from the
walls.

The original tutorial had a bug where if the paddle's velocity was too
big, if you hit the edge of the game it would slowly move out of the
window. I fixed that issue, and you can see what my fix was. I didn't
document the fix in the literati source code, as I believe the actual
code is clear enough.
not support texttospeech
Added some device gotchas
add clamp function
View bug fixes
Document default tasks, remove obsolete config section
Significantly improved database handling
bugfixing and log location change
Angriff
added CNAME - custom domain
tweaking npm dependency versions
Fixed garage scene

synced decorations and grinch
added type sd:GraphCollection
Add test case for get week number of the year
fix bug of get week number of a year
Merge pull request #495 from aleafs/develop

Fix bug to get week number of year.

It seems our ISO week number implementation was wrong. Check the wiki page
about it, and the talk section for more details on the current algorithm
http://en.wikipedia.org/wiki/ISO_week_date.
now only warns on failure for merges

Signed-off-by: Tim Henderson <tim.tadh@gmail.com>
Okay, remove all the StdClass nonsense
Only affects active window toolbar.
binディレクトリの追加
gitconfigも追加
Rename setRGB to set
Add travis status to readme.
Prep for 0.2.1 release (the first to central).
Back to snapshot.
Add @in
tidy
remove AFTER_INSERT hook
cpufreq: s3c64xx: Reduce voltage for 166 MHz.
removed launchy dependency
init commit
test page
ant support to generate war
removed war
Handle hits better
Added developer IRB rake task
Finished adding values for SPED, MFD, and SPC
Merge branch 'master' of github.com:trillek/entropy
changed multitasker to use the interrupt manager
Fix rope / flymake functions, and use recursive grep instead of find + grep.
bump cd-client to 0.3.5
Merge pull request #83 from trptcolin/upgrade-cd-client

Bump cd-client to 0.3.5
more PCM formats and Query HW info from kernel friver
Now server is not hitted every half a sec
Moved bitRate from Profile.cs to Block.cs

Signed-off-by: daniel mei <daniel.mei@bellmedia.ca>
Merge branch 'master' of ctsgit.production.ctv.ca:fortytwo/fortytwo_dal
dispose log when job stops
dispose lookupdataprivder
change data provider to static
added log src name
add more log info, passing paramter to taskfinished handler
Apply schedules and constraints when searching medias/contents

Signed-off-by: daniel mei <daniel.mei@bellmedia.ca>
add destination and platform parameter for Rest APIs that search media/content.

Signed-off-by: daniel mei <daniel.mei@bellmedia.ca>
change calls to DAL to Soap
Merge branch 'master' of ctsgit.production.ctv.ca:fortytwo/fortytwo_dal
updated search criteria for MediaCachingDataProvider

Signed-off-by: daniel mei <daniel.mei@bellmedia.ca>
Added soap API to get media hierarchy by type and id
Merge branch 'master' of ctsgit.production.ctv.ca:fortytwo/fortytwo_dal
created ctv.fortytwo.Workflow.HttpListener project
Update jquery.fx.js

where: function resetTranslate

edit:
initMatrix = this.cssMatrixToArray( c );

to:
initMatrix = c != 'none' ? this.cssMatrixToArray( c ) : [1,0,0,1,0,0];
Adding packet size limit
Add tests, eliminate TODOs and XXXs
wait for both json objects to be recieved before adding entry to collection
Properly fixed nested map deserialization problem
Profile List archive pages are automatically generated via an internal taxonomy
Fixed search form action url
Minor Fixes to README and api
建立标签表

建立标签的主库是以后需要用到的所有主库，（可能少一个“知识”），class以后将改名team，client以后将吸收所有人类
bugfix案下文件上传后文件名没有改成case_document.id
refactoring view & controller
Print out samples db diffs
Update samples db
Sort exts and filenames
Rebuild samples db
Some comments are triggering charlock binary
Skip empty sample
Ensure lang is skipped on any binary file
Rebuild samples db
Linguist 2.3.4
Add wrap flag to text languages
No warnings
Fix tests for pygments.rb 0.3.x
Build script for mac
Merge branch 'master' of github.com:updraft/updraft
fix layout of transaction tools
upgrade rails version to 3.2.8 and ruby version to 1.9.3
add shipping cost feature to basic setting fixes #921
前后台订单新建增加运费计算 fixes #922
update readme
Removing TODO file. (created an issue for the item listed)
Adding the Cython-generated C code. Necessary for proper install.
Adding acstb and map_c modules to the mock code in conf.py
Fixed issue with upper case functions. This should now work.
New README much better.
high coverage to 1.5
reload server files when created/updated
remove log
Fix for issue #105
Fixed issue #105

If an invalid or unknown format is sent, we respond with an empty response.
Removed console.log call
Merge pull request #106 from komola/issue/105

Fix for issue #105
Show Football Stats in User List Page
Aded timestamp to the page
Remove 'get_' from Position getters
Remove 'get_' from Transposition getters
Remove 'get_' from Pieces getters
Remove 'get_' from Game getters
Remove 'get_' from Tree getters
Improve Time code
Rewrite IID
moved callbacks up to the top level and depicted their call sequence
Modified Headers bis
trying to add food
Bug 2183 - Comment/ Klip title - long comment/title does not displayed properly
fix Makefile, add clean
add udev rule to restore backlight on ac power
pkgver bump
Fixed rexter, redis, blueprints pkgs.  Added compression.  More fixes.
+ sync again :) | THX @dorimanx
Replaced space indent with tab indent
started osc communication with of player
still noticeable problems with libvlc
Added parsing state mechinism with builtin Debugging tool
Eclipse プロジェクトを Git 管理下に追加
Merge remote-tracking branch 'origin/eclipse-project-testing'
public/indexを削除
eval demo
Add file name validator.
Added all the markers on the map and stored marker locations in mysql.
First version
Merge branch 'master' of github.com:webnull/anaHTTP
IResponse interface were added. CommonSession renamed to Session
new file:   a.out
	new file:   bin_tree.c
	new file:   huff.c
	new file:   input
	modified:   ../a.out
	deleted:    ../bin_tree.c
	modified:   ../hannoi/hannoi.c
	modified:   a.out
	new file:   hannoi/a.out
	modified:   hannoi/hannoi.c
	modified:   tree/a.out
	modified:   tree/bin_tree.c
	deleted:    bin_tree.c
	new file:   hannoi/a.c
	modified:   tree/a.out
	modified:   tree/bin_tree.c
	modified:   tree/huff.c
	deleted:    bin_tree.c
update
swift proxy log
Some cleaning and refactoring.
Added some units.
Remove spree_contact_us extension
Update product_sort extension
Add Cadenza cli executable
Merge pull request #5 from joefiorini/cli

Add Cadenza cli executable
add options let 'shell to read .bashrc
Merge pull request #3 from wikimedia/develop

Develop
Convert reset.css into reset.less and remake
Merge branch 'hotfix/cssreset' into develop
settings for adhoc distribution
Icon, loading images, etc. for making this a a real app
handled error message on return from m5 call and displayed result on dialing screen. removed TestFlight feedback button as dashboard is still not displaying feedback.
mkei
Merge branch 'master' of https://github.com/winki/SpaceWars.git

Conflicts:
	SpaceWars/src/spacewars/SpaceWars.java
	SpaceWars/src/spacewars/network/Client.java
	SpaceWars/src/spacewars/network/IServer.java
	SpaceWars/src/spacewars/network/Network.java
	SpaceWars/src/spacewars/network/Server.java
delete database config info
Formatting update in CardSwitchGesture.h
Fix incorrect flick logic
Converted into html5

Phase 1
According to new login.php and foget.php

Phase 1
Unified multiple admin css into one file

Phase 1
improve support for shapefile wraparound - take into account the DBF
size as well as the SHP size and wrap if either becomes too large.
(SHX are guaranteed to always be smaller than the accompanying SHP.)
changed model
Merge branch 'master' of https://github.com/woongiap/mywork
Added missing return statement

Added readme
PATH
いろいろ
Moved validation to top of method.
Merge pull request #229 from peterson/master

Moved validation for creation of image
Added more in gnome section
don't print subframes by default

because leading zeros may not match.
add interfaces for converting framerates and frames
and fix rounding issues for large sample-rates and/or subframes.
NOOP: spacing and comments
revisit common FrameRate definitions.
some test code.
expand root when new level is created
catch NoClassDefFoundError and continue with incomplete type info in ctor and class defs too.
gk module
+ guard progress bar and + numeric validation of phone properties uootl
inne podejscie do usuwania obrazu
>>> normalize.css 추가. v2.0.1
- normalize.css, xe.css를 common.css 병합
- xe.css 대신 common.css 또는 common.min.css를 로드하도록 변경.
Destroy the VM after a storage migrate operation

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Fix VDI migrate - we were using the same id for both send and receive
mirror records, but they're stored in the same hashtbl :-(

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
CA-80440: Fix String.sub exception in xe vm-migrate parameters.

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
Merge commit 'a176cbfe33edd3205e69d45179f34838d0046fec'
Merge commit 'cef7745290f310cda0036b039e0b818634764f2f'
修改readme，add license
Noock edited text
Merge branch 'master' of https://github.com/xinexo/TimeBank
Noock edited config/timebank.php
add mao in perspective.docx
Merge branch 'master' of https://github.com/xiongyw/xiongyw
update homepage with simplified style
Model propagation
jdk setting
defstruct のコンストラクタで引数を指定すると、スロット定義の初期値が無視される問題を修正. #36

    user> (defstruct (foo
              (:constructor create-foo (x)))
            x (y 2))
    #<structure-definition: foo>

    user> (create-foo 1)
    #S(foo x 1 y nil) ;; #S(foo x 1 y 2) になるべき
Merge branch 'fix/defpackage-constructor' into develop. #36
バッファファイル名のチェックを追加. #32
Merge branch 'devkit' into develop
si:pack-int64 などをリファレンスに追加. #52
Merge branch 'feature/#52-pack-int64' into develop
si:make-chunk で不正なポインタかどうかをチェック. #251
chunk の pack/unpack で EXCEPTION_ACCESS_VIOLATION 例外を処理. #251
pack/unpack のアクセス違反のテストを追加. #251
access-violation-address をキーワードに追加. #251
Merge branch 'feature/#251-handle-access-violation' into develop
update PATH and PYTHON_PATH
Sst add
Merge branch 'master' of github.com:yaasita/myvimrc
add AngularJS example usage
add genunderscore
test
test
misc
+ ‘banner_alps_progressive.jpg’
+ ‘banner_br_progressive.jpg’
+ ‘banner_ny_progressive.jpg’
+ ‘banner_paris_edit.jpg’
+ ‘bg_map.jpg’
+ ‘image.jpg’
ORM fixes
Added boxsizing polyfill as possible fallback for grid in IE7.
Fallback for browsers which don't support box-shadow.
Fix for lightbox images in IE8 (related to responsive images).
IE7 inline-block hack.
IE7 inline-block hack.
New release 286
chec kout
Add jasmine tests for sorting
fixed new line mmebers
name ordering
line
line
line
line
rounded edges
add rule no 4
plugin/ryu: update for ryu update

blueprint ryu-plugin-update-for-ryu
Now ryu has GRE tunnel support, so update ryu plugin to support it.
This implements/simplifies GRE tunneling support for ryu plugin

Change-Id: I158affcb60c9016753dbbbf5f1ad50286af49c23
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

Conflicts:

	quantum/plugins/ryu/agent/ryu_quantum_agent.py
	quantum/plugins/ryu/db/api_v2.py
	quantum/plugins/ryu/ryu_quantum_plugin.py
Removed TOD comment since: All groups of which user member automatically filtered in find_by_sql => no specific action needed.
オプション's'のバグ修正
#html2decoでscriptタグとstyleタグは複数行マッチで調べるように
あまりにHTML4Ktai#html2decoが遅いなら処理を中止する
1つのjobあたりの処理時間を制限
Update vimrc
Use railscast submodule
Remove command-t
ajout de config (dont secret key)
ajout de la config
uniformisation de la config de flask
Merging pull request from naps62
Correcting some stuff [ci skip]
Removed `@require`, it won't work. Need to find something else for plugins.

#38
Removed extraneous `context`.
Updated `databag` reference.
Removed references to `context` passed as argument to callbacks.
Updated examples in user documentation.

These need to be tested.
Simplified README.
Initial code for `@param` (in root scope).

#40
Reset the changes of the hotkeys on press the Close button.
add events.js to browser.html
Remove coq vim plugin

Good riddance.
split up the source components, update README
Merge branch 'master' of github.com:zhengkai/config
Merge branch 'master' of github.com:zhengkai/config
Merge branch 'master' of github.com:zhengkai/config
git alias
1，增加图片传输
2，修改filter界面为垂直布局
Added unit test for Opera Mini 10.54 on J2ME. Had to update sniffer code.
Add *.iml files to ignore
Little cleanup in VimKeyMapUtil.

- reimplement installKeyboardBindings
- reimplement reconfigureParentKeymap
- cleanup error reporting code
- reformat code (sorry ;-))
Fixes after VimKeyMapUtil cleanup
Introduce couple constants in VimKeymapPanel
Less hrs.
Use width 50% instead of max-width.
Fixed Issue #3382 - The comments under postings are missing when using the #tags -view
bumped version
gem name should be zurb-foundation
Merge branch 'master' of github.com:zurb/foundation
Convert topbar to support Zepto and new foundation syntax.
Add mobile functionality to zepto.
Merge branch '4.0-wip' of github.com:zurb/foundation into 4.0-wip
Fixed a content property issue for breadcrumbs
rearrange a bit these files
licence_groups and licence_groups content
alter the favicon.ico
tenclouds.crud.fields is now a proper module
Actually set the head to a player head
jquery.base64 not necessary anymore
need the response param
remove some more unneeded notices
fix oauth callback error handling
Merge branch 'master' into design
Remove use of bgcolor attribute
DNSmezzo/packets2postgresql.c: fix range issue with return value from getopt(3).

When CHAR_MIN is 0 a char can not cope with the result of getopt(3).
Use an int instead.
Merge pull request #1 from kmkaplan/master

Consider for inclusion.
Implement UI for projects
deleted GenericDao%
Added Data Containers
Add recipe for highlight-parentheses
Merge pull request #66 from shosti/master

Add recipe for highlight-parentheses
Add recipe for redshank.
Merge pull request #68 from Abrahanfer/master

Added recipes for Jabber-mode
Add recipe for gnuplot-mode
[sd] added adam spiers smooth scrolling
Merge pull request #69 from shosti/master

Add recipe for gnuplot-mode
Merge pull request #70 from deobald/smooth-scrolling

[sd] added adam spiers smooth scrolling
Add recipe for autopair
Merge pull request #71 from maio/autopair-recipe

Add recipe for autopair
fix missing quotes in elscreen recipe
property list wasnt named properly for writegood-mode
add elisp script to print missing packages

response to #72
Parse archive-contents file more rigorously when building the html index (fixes #49)
remove debugging print statements
Tidy up build-all functions
After build, remove pre-built packages for which no recipe exists (see #76)
Two recipes for loading themes buffer-local one for color-theme other for
emacs24

Conflicts:

	recipes/color-theme-buffer-local
added a few prelude related packages
Merge pull request #78 from bbatsov/master

Added a few Prelude related packages
Correct the formatting.
Move URL details to its own section.
minor adjustments to aesthetic, fixed user info box, added remaining plugins
Adding task queue tests
Clean module html
Agregado userProfile
Merge branch 'UserProfile' of https://github.com/Avangarde/gnosis.git into SubscribeSubject
enabled adding filter conditions.

fix fixes and tests.
changed filtering process to select items according to best score.
game loop finished
less magic numbers
ball movement detection on server side
positions bug fixed
ball is moving now
returning a ball with rackets
renaming in pong.coffee
switched MINC2 to LIBMINC
Removed README as it's outdated
Merge branch 'master' into readonly
testing 50x
Small change in the UI layout.

Signed-off-by: Jianming Xiao <cd_bigegg@hotmail.com>
Change font option in bigger gap toggle and remove that from furniture customizer
cosmetics for PVR section
border for focused color in color select
changed media menu indicator bg texture
updated skin fanart + skinsettings image
moved quicknav label to bottom
Fix typo in onright fix
Wrong font for settignscategory
Better cdcovers
Logging total executed cycles.
фикс драпера
Initial commit
First load of code.  Don't send Web*.config
Merge branch 'master' of https://github.com/BruceMebust/MnYU0
Move some data to new db
try to hide .config files
add .config
add .config
Merge branch 'master' of http://github.com/BruceMebust/MnYU

Conflicts:
	README.md
Archlinux shoutout.
quickfix for testProjectDescriptionUploadProject
Quickfix for testUploadingProjectDescriptionDefaultValue
Issue 47: fixed and added new tests
Issue 47: last commit did not fix the problem
fixed rename bug and updated test
Issue 47: small fix
Merge branch 'master' into GithubIssue47
Ennatyslistaaja
Merge pull request #1 from Chlara/master

kleinere Anpassungen in validation.module(.impl) und Changelog
Merge pull request #2 from Chlara/master

Neue Reihenfolge der Module auch in (fr_)messages.properties nachgetragen
Addid Step J
Removed unnecessary checks
Validation of xml against xsd optimized.
Merge pull request #3 from KOST-CECO/master

Pull 5 commits from ceugster to Chlara
PEP-8
Merge branch 'develop' of github.com:ClouDev/CloudBot into develop
Stub for roster module.
implement some load opcodes
Agregué el menú para listar importaciones y descargar el reporte
FIX: cantidad de filas por paginado coincide con limit del baseparam del
data store
FIX: cantidad de filas por paginado coincide con limit del baseparam del
data store
ahora permite enviar el selModel en el archivo de configuración
Cambios para permitir listar y descargar un reporte de una importación dada
Adding FIO
Added simple GWT File Dialog to replace SWT file browser. All refferences to SWT browser changed.
rooooocckkknnnrooll
Rebuild with updated interleave version, added component.json
Added menu item bandaid for getting all actions
Fixed CentralWidget ToolButton widths to expand to ToolBox width
Added better debugging output for plugin loading failures
Moved SourceView from SWAT to PTGF
Cleaned up SourceView; generalized annotations
Added "PrettyWidgets" library object for TabWidget
Added shortcut to SettingManager dialog action (only visible under Mac, though); setup SourceView as more of a runtime-loaded library, than a plugin by exporting the view directly (need to abstract this more later)
Updated references to versions to update automatically, or 0.3
Crasher reported by @sroldan.

Latent bug.
More robust code around declared but missing nagios.cfg
Bumping to 3.1.4
Make sure we only have 1 version of the docs.
Fixing network traffic bug.
tweak the NSIS install so upgrades work better
Add system.mem.used to Windows system metrics
remove the agent installer exe from git
Don't overwrite config files on upgrade
use a faster mirror for downloading solr in travis
whitespace fix to re-trigger a travis build
Merge branch 'master' into checks.d

Conflicts:
	agent.py
A few more apiKey -> api_key stragglers.
Add the vendor.
Merge branch 'master' of github.com:DataDog/dd-agent
Fix RPM restarts on upgrades.

This won't appear to be fixed until two releases from now, since
the bug is in the prerm step of agents already in the field.
After than all should be well.

Fixes #250.
Commit 005-ish
Adding tapes
Removed UITableViewCell subclasses.
Move AnimationFinished event to abstract base Animation class.
Add help methods to the MoveCardAnimator to be prepared to animate placing a card from the player to the pile.
PDO implementation complete
Add initial files for the texlive-texmf port.
Update README to reflect addition of texlive-texmf port.
Add username and hostname to the awesomepanda theme, as a new name.
Need to unlock taxa after processing them through resque.
Adding support for cc-zero and no known restrictions licenses in XML and DwC schemas, validators, and the Flickr and Wikimedia Commons connectors
Remove the client and node form the chef server on destroy of box.
:O

:OOOOOO
Merge pull request #1 from surjikal/patch-1

:O
PureMVC Java snapshot
applied integrated kernel building
Добавлен файл с шаблоном шапки файлов PHP
Мелкие правки.
В диалоге добавления стандартного шаблона показывались уже добавленные шаблоны.
Auto load correct page when linking a project
Fixed an error and a warning from the last commit (oops)
Merge branch 'master' of github.com:FTWinston/killer into AutoCleanup
fenopy.se fix
projects are shown when there design document has a change. Comment are shwon sorted by the main threads
upoaded Vector example(0073)
namespace docu
Additions to the bot class: just testing some stuff with player movement
Deleted the notes
euler impl
maxwidth fix
force #version 130 on tetra shaders
smaller shadow cache memory footprint
use texture border for minimap
linear depth in g-buffer seems much faster than raw depth on ivy bridge
workaround for buggy depth stencil on windows ivy bridge driver
remove an unnecessary shader reset
real-time diffuse global illumination for sunlight
gi variable tweaks
gi test map
getrhlight fix
GI quality options and fixes
GL_EXT_texture3D was never available on mac, instead is part of core since glversion 1.2 - so dont use EXT named calls
3D texture extension check cleanup
remove accidental left debugging code
lower RSM spread a bit to preserve some local detail
nicer RH split transitions
rhinoq experiment
use smaller light tile batch on intel
lighttilebatch tweaks for intel on linux
Chỉnh sửa 1 số thứ linh tinh:

- Lịch mở cửa phòng
- Thêm print cho các trang danh sách
Adding protocols.
Adding .gitreview and .gitignore.

Change-Id: I1cfe010fc571600e47c589e45e108f3e06b9013f
Fix the name of the extension

Change-Id: I0188900feca6064e6741ceca86d1a9cb8f5f83dc
Adding message documentation.

Per Raymond's suggestion in change I0188900f, this change will add
message documentation strings so that it can be translated on
Translatewiki.net.

Note: I am open to suggestions to change the usage of the phrase
"Host statistics", as it can be quite confusing. It generally means
the information about the server.

Change-Id: I67fcda8a9048927ed0312eaed2e263a38c532265
Merge remote-tracking branch 'upstream/master'
fix #18 join us notification bug
Fix:  Function ereg() is deprecated, *PHP 4/5

Fix:  Function ereg() is deprecated, *PHP 4/5 Weiche wird verwendet.
Fix Notice: Undefined variable: out

Fix Notice: Undefined variable: out in 'inc\teamspeak_query.php'
Fix & Update GameServer Box

Fix Notice: Undefined index: gamemod in 'inc\menu-functions\server.php'
Fix Notice: Undefined index: hostname in 'inc\menu-functions\server.php'
Fix Notice: Undefined variable: pwd_info 'in
inc\menu-functions\server.php'
Fix Notice: Undefined variable: pwd_txt 'in
inc\menu-functions\server.php'
Fix Notice: Undefined index: players in 'inc\menu-functions\server.php'
Fix Notice: Undefined index: maxplayers 'in
inc\menu-functions\server.php'
Fix Notice: Undefined variable: pwd in 'inc\menu-functions\server.php'
Fix Notice: Undefined variable: game in 'inc\menu-functions\server.php'
Fix Notice: Undefined index: players in 'inc\menu-functions\server.php'
Fix Notice: Undefined variable: player in
'inc\menu-functions\server.php'
Fix Notice: Undefined index: maxplayers in
'inc\menu-functions\server.php'
Fix Notice: Undefined variable: servernavi 'in
inc\menu-functions\server.php'
Update: Unterstützung für .png und .gif Bilder bei der Map Vorschau.
Update: Statische Texte wurden in die deutsch.php und englisch.php
exportiert.
Merge pull request #154 from hammermaps/master

Notice Fixes & Updates / Fix deprecated function
Manthan Begins
Lighter version of lite: removed duplicate javascript calls.
Changed info in README
Merge branch 'master' of https://github.com/ISUCT/ISUCT_2012
Update README.md
Пример второй лабораторной
Пример второй лабораторной
Пример 3-й лабораторной работы
небольшие комментарии
3 lab
Merge branch 'TestBranch' into TrefilovaNS

Conflicts:
	src/com/isuct/programming/HelloWorld.java
git ignore
Maintenance
Removed MD documentation in favour of pages
Update to Cef 1084 - bing WebViewEx back to life!
Corrected one nav test that failed and shouldn't. Two other tests are failing.
another attempt at fixing phantom fonts
Merge branch 'master' of https://github.com/makrio/makrio
Remove the ugly title.
Add input restriction for login and user edit
Merge pull request #69 from haria02/master

Add input restriction for login and user edit
Tweeked LoginWindow, added more to SPOptions
Tweaked CSS + Markup

more lab work
This is now the REST0 framework only repository.
Project reorganization and cleanup.
Replacing “ScriptingBridge.framework” with SDK provided version. 
Cleaning/simplifying build settings. 
Implementing encoding detection using UniversalDetector. 
Cleanup.
Glossary unnecessary, hence removed.
Add a title helper
change hash syntax
Finish layout and routes
Delete default Rails index
Display unit N (Knots) as Kts
actualizacion
Merge branch 'master' of https://github.com/JesusKenji/ikela
Actualizacion de repo
switch to IDEA branch 117 (11.1)
re-include jQuery and html5 JS APIs into the kotlin-js-library now it seems KT-2316 is fixed
Fixed KT-1847.
remove constructor parameter of JavaNamespaceDescriptor
Rename PropertyAccessorData to PropertyPsiDataElement and move it to wrapper package
Extract JavaPropertyResolver#GroupingValue class to wrapper package and rename it to PropertyPsiData

Minor code improvements
Refactor JavaPropertyResolver and PropertyPsiData
Rename methods in PsiMethodWrapper
Refactor JavaPropertyResolver#getPropertyType
Refactor JavaPropertyResolver#getReceiverType
Refactor JavaPropertyResolver
Minor: fix formatting in JavaFunctionResolver
Refactor PropertyPsiData
heroku
heroku
heroku
f
s
mail
m
M
m
a
a
a
df
1
Merge branch 'master' of heroku.com:web115
Merge branch 'master' of heroku.com:web115
a
temp
Initial commit
Improve the README file again
Merge branch 'master' of https://github.com/Jigdel/first_app
fixing NPE
moving initscript out of advanced
Added enhancement:
	First row of the combobox is empty. But you can't select an empty value (which is exactly as we want it).
	Added a value "not played". When we select this value, we must still handle this. So this is not implemented yet.
updated core, admin_menu_backup_migrate, date, devel, getid3, globalredirect, jquery_ui, pathauto, token, views
Removing mysql empty dir and .vagrant file
libs dir brought into code dir, added requirejs source placeholder
lovely button mix-ins for language select panel
添加搜索结果排序功能，修复许多bug
Merge branch 'master' of https://github.com/KJlmfe/slimevent
完成报名名单查看功能
Merge branch 'master' of https://github.com/gardenia2007/slimevent
Update README.md

Updated info in ReadMe
Merge branch 'master' of github.com:linkenneth/bighack
Takes in generator and creates the visuals
Merge remote-tracking branch 'michaellin/master' into tmp-merge
Check for View before connecting to its render() slot

This checks for a valid View object in the pqPropertiesPanel
class before connecting to its render() slot. This fixes a
few runtime warnings emitted by QObject::connect().

Change-Id: I0cc10081d01e3d478dfb912d2f8696e77fb3c8dc
Merge topic 'panel-fixes' into next

5faff7d Check for View before connecting to its render() slot
User Data Commit
Changed $yiic to refer to yiic.php file
Bug fix + menu update

Fixed bug in posting class that allowed guest to post
Added alternative ul/li wrapping to menu class
Added droplinemenu javascript
Merge branch 'remdb' into develop
temp
temp
temp
Merge branch 'sendnet' into develop
Merge branch 'remdb' into develop
Merge branch 'develop'
Added entry/stairway messages.
again README.md
call NERDTreeToggle instead of NERDTree
Server Port fixing
Main changes at client's version

Fixed #4 by adding optional checkings. Fixed #5 by adding function.
Drag'n'drop sprites select. Builds are not included to GitHub
repository. Active corner function was added.
Initial Crunch texture support implementation. TODO: Automated deps and using InternalName() inside TextureAsset in all places where Ogre is called.
CRN: Use internal name also in operationCompleted(). Fix docs to be clearer.
CRN: Implement crunch SVN for windows fullbuild. Implement cmake macros in OgreRenderingModule to find crunch, untested on linux/osx. Cover edge case where .crn cache file is in place but decompressed .dds is not, meaning the user manually deleted it from cache dir. Make OgreMaterialAsset ask the InternalName from texture asset so we dont have to upkeep the code in multiple places. Expose some useful functions to scripting as public slots.
CRN: Fix rest of the places that could cause problems to NameInternal().
CRN: Make crunch library optional, we dont yet know how feasible the lib is on mac/linux. Until we confirm and integrate the build steps to linux/mac build scripts make Tundra build without crunch. If not present .crn textures will simply fails with message that crn support is disabled.
Crunch: Remove the lib dependency, use as header only. Headers shipped in ogre rendering module like libsquish. We can adjust these headers in our repo if there are mac/linux issues, until the crunch repo supports them fully.
Crunch: Fix bug when doing synchronous loading, ptr was invalid.
Fix mac build in libcrunch headers
Fix merge conflicts with rex/tundra2 in win .cmd build files.
Replaced AttributeChanged(IAttribute*, AttributeChange::Type) signal with IComponent::AttributesChanged() signature for all components, excluding EC_SkyX and EC_Script because of the signal handling design, EC_Terrain and EC_HoveringText which were already modified, and EC_Sky, EC_Fog, EC_ParticleSystem, EC_Billboard, and EC_EnvironmentLight which will be moved in OgreRenderingModule as discussed in #541
Merge with rex/tundra2.
Now that asset bundle code is in tundra2 branch, crn textures needs to be added to the supported format extensions list in the TextureAsset factory so it will continue to work correctly.
Merge remote-tracking branch 'rex/tundra2' into admino_attributeschanged

Conflicts:
	src/Application/CanvasPlugin/EC_GraphicsViewCanvas.h
	src/Core/OgreRenderingModule/EC_Camera.cpp [manually edited in EC_Camera::AttributesChanged() for aspectRatio attribute]
	src/EntityComponents/EC_ProximityTrigger/EC_ProximityTrigger.h
	src/EntityComponents/EC_Sound/EC_SoundListener.cpp
	src/EntityComponents/EC_Sound/EC_SoundListener.h
Merge pull request #532 from Adminotech/admino_crunch

Adminotech - Crunch texture support
Merge remote-tracking branch 'adminotundra/admino_attributeschanged' into tundra2
Fix to EC_Avatar to not use SetMaterial(), but instead to set the material attribute.
Add back "fog_override true none" to SkyX.material. These are needed in order to make Fog and SkyX components play nice together. These lines were accidentally removed here https://github.com/realXtend/naali/commit/dc035688a18d89f40295117f312b5943add824ad
Revert "Replace bool EC_Camera::attached_ with IsAttached function instead." This reverts commit 6ed8f9745cb33e093c744dc8f71b997ef8ccc509.

The boolean exists for a reason (Ogre crappiness, Ogre::SceneNode::getAttachedObject throws an expection if no object found...).
Fixes Resources not to include namespace when the return type is array of custom class
Fixes a bug with ValidationInfo parsing @choice inline comment
Improves inline comment parsing by array conversion when delimiter is found and tag is not @pattern
Updated README to reflect the improvements